diff --git a/[refs] b/[refs]
index eef970c81328..2774bbb80c4f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecce6332ef5f88ba0ac8e9e7511538431952dda7
+refs/heads/master: 324da11efaea562c8270834ac03c7c3df03aa79b
diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c b/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c
index c4600d0c9bc3..6edbb47d4e33 100644
--- a/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c
@@ -97,7 +97,7 @@ Configuration Options:
  * This is straight from skel.c -- I did this in case this source file
  * will someday support more than 1 board...
  */
-typedef struct board_struct {
+struct board_struct {
 	const char *name;
 	unsigned short device_id;
 	int ao_chans;
@@ -108,7 +108,7 @@ typedef struct board_struct {
 	int regs_badrindex;	/* IO Region for the control, analog output,
 				   and DIO registers */
 	int reg_sz;		/* number of bytes of registers in io region */
-} board;
+};
 
 enum DIO_METHODS {
 	DIO_NONE = 0,
@@ -116,7 +116,7 @@ enum DIO_METHODS {
 	DIO_INTERNAL		/* unimplemented */
 };
 
-static const board boards[] = {
+static const struct board_struct boards[] = {
 	{
 	      name:	"cb_pcimdda06-16",
 	      device_id:PCI_ID_PCIM_DDA06_16,
@@ -133,10 +133,10 @@ static const board boards[] = {
 /*
  * Useful for shorthand access to the particular board structure
  */
-#define thisboard    ((const board *)dev->board_ptr)
+#define thisboard    ((const struct board_struct *)dev->board_ptr)
 
 /* Number of boards in boards[] */
-#define N_BOARDS	(sizeof(boards) / sizeof(board))
+#define N_BOARDS	(sizeof(boards) / sizeof(struct board_struct))
 #define REG_SZ (thisboard->reg_sz)
 #define REGS_BADRINDEX (thisboard->regs_badrindex)