diff --git a/[refs] b/[refs]
index c42fde16df57..e7ab295a9fb8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe7858af4f04d6ea5d18a513433846c63c70d0ec
+refs/heads/master: cfee7b998b2407f5ee53d76bae9e2805baf6dbb4
diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c b/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c
index dcd56f809944..3c78c42b7f41 100644
--- a/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -83,7 +83,7 @@ See http://www.measurementcomputing.com/PDFManuals/pcim-das1602_16.pdf for more
 #define RESID_COUNT_L 14
 
 /* Board description */
-typedef struct cb_pcimdas_board_struct {
+struct cb_pcimdas_board {
 	const char *name;
 	unsigned short device_id;
 	int ai_se_chans;	// Inputs in single-ended mode
@@ -98,9 +98,9 @@ typedef struct cb_pcimdas_board_struct {
 	int dio_bits;		// number of dio bits
 	int has_dio;		// has DIO
 	const struct comedi_lrange *ranges;
-} cb_pcimdas_board;
+};
 
-static const cb_pcimdas_board cb_pcimdas_boards[] = {
+static const struct cb_pcimdas_board cb_pcimdas_boards[] = {
 	{
 	      name:	"PCIM-DAS1602/16",
 	      device_id:0x56,
@@ -134,7 +134,7 @@ MODULE_DEVICE_TABLE(pci, cb_pcimdas_pci_table);
 /*
  * Useful for shorthand access to the particular board structure
  */
-#define thisboard ((const cb_pcimdas_board *)dev->board_ptr)
+#define thisboard ((const struct cb_pcimdas_board *)dev->board_ptr)
 
 /* this structure is for data unique to this hardware driver.  If
    several hardware drivers keep similar information in this structure,