diff --git a/[refs] b/[refs]
index d0eed47dc84e..142b2c475a2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43313b07343b81463c8edd99a8c315c6dc2d5c7d
+refs/heads/master: 92b635c5bea18d7eb3c46bfdcc930d9d86d3d177
diff --git a/trunk/drivers/staging/comedi/drivers/ni_at_a2150.c b/trunk/drivers/staging/comedi/drivers/ni_at_a2150.c
index ed5f5576d992..5d45bf24a5ef 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_at_a2150.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_at_a2150.c
@@ -119,12 +119,12 @@ TRIG_WAKE_EOS
 #define I8253_MODE_REG		0x17
 #define   HW_COUNT_DISABLE		0x30	// disable hardware counting of conversions
 
-typedef struct a2150_board_struct {
+struct a2150_board {
 	const char *name;
 	int clock[4];		// master clock periods, in nanoseconds
 	int num_clocks;		// number of available master clock speeds
 	int ai_speed;		// maximum conversion rate in nanoseconds
-} a2150_board;
+};
 
 //analog input range
 static const struct comedi_lrange range_a2150 = {
@@ -136,7 +136,7 @@ static const struct comedi_lrange range_a2150 = {
 
 // enum must match board indices
 enum { a2150_c, a2150_s };
-static const a2150_board a2150_boards[] = {
+static const struct a2150_board a2150_boards[] = {
 	{
 	      name:	"at-a2150c",
 	      clock:	{31250, 22676, 20833, 19531},
@@ -154,7 +154,7 @@ static const a2150_board a2150_boards[] = {
 /*
  * Useful for shorthand access to the particular board structure
  */
-#define thisboard ((const a2150_board *)dev->board_ptr)
+#define thisboard ((const struct a2150_board *)dev->board_ptr)
 
 struct a2150_private {