diff --git a/[refs] b/[refs]
index 2c6cf35ed26e..c43c0e922ca0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c77e25898523395b56e1d120195e1ad2e3efa14d
+refs/heads/master: 1657e325042ffc723182377a47d38ccc7319078f
diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcidda.c b/trunk/drivers/staging/comedi/drivers/cb_pcidda.c
index 27f46a609e39..7918e322d7a2 100644
--- a/trunk/drivers/staging/comedi/drivers/cb_pcidda.c
+++ b/trunk/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -129,7 +129,7 @@ static const struct comedi_lrange cb_pcidda_ranges = {
  * boards in this way is optional, and completely driver-dependent.
  * Some drivers use arrays such as this, other do not.
  */
-typedef struct cb_pcidda_board_struct {
+struct cb_pcidda_board {
 	const char *name;
 	char status;		// Driver status:
 	// 0 - tested
@@ -139,8 +139,8 @@ typedef struct cb_pcidda_board_struct {
 	int ao_chans;
 	int ao_bits;
 	const struct comedi_lrange *ranges;
-} cb_pcidda_board;
-static const cb_pcidda_board cb_pcidda_boards[] = {
+};
+static const struct cb_pcidda_board cb_pcidda_boards[] = {
 	{
 	      name:	"pci-dda02/12",
 	      status:	1,
@@ -206,7 +206,7 @@ MODULE_DEVICE_TABLE(pci, cb_pcidda_pci_table);
 /*
  * Useful for shorthand access to the particular board structure
  */
-#define thisboard ((const cb_pcidda_board *)dev->board_ptr)
+#define thisboard ((const struct cb_pcidda_board *)dev->board_ptr)
 
 /* this structure is for data unique to this hardware driver.  If
    several hardware drivers keep similar information in this structure,