diff --git a/[refs] b/[refs]
index dd9c33edbc06..b2e5e5a123ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9da18ff8c352c8827abee8ebd8570d8bf2767ebb
+refs/heads/master: b36536816e1f34b2be1da9edb78e8b55bc414081
diff --git a/trunk/drivers/staging/comedi/drivers/daqboard2000.c b/trunk/drivers/staging/comedi/drivers/daqboard2000.c
index ae1f6145c565..3b8444f09f28 100644
--- a/trunk/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/trunk/drivers/staging/comedi/drivers/daqboard2000.c
@@ -325,7 +325,7 @@ static DEFINE_PCI_DEVICE_TABLE(daqboard2000_pci_table) = {
 
 MODULE_DEVICE_TABLE(pci, daqboard2000_pci_table);
 
-typedef struct {
+struct daqboard2000_private {
 	enum {
 		card_daqboard_2000
 	} card;
@@ -334,9 +334,9 @@ typedef struct {
 	void *plx;
 	int got_regions;
 	unsigned int ao_readback[2];
-} daqboard2000_private;
+};
 
-#define devpriv ((daqboard2000_private*)dev->private)
+#define devpriv ((struct daqboard2000_private *)dev->private)
 
 static void writeAcqScanListEntry(struct comedi_device * dev, u16 entry)
 {
@@ -731,7 +731,7 @@ static int daqboard2000_attach(struct comedi_device * dev, struct comedi_devconf
 	bus = it->options[0];
 	slot = it->options[1];
 
-	result = alloc_private(dev, sizeof(daqboard2000_private));
+	result = alloc_private(dev, sizeof(struct daqboard2000_private));
 	if (result < 0) {
 		return -ENOMEM;
 	}