diff --git a/[refs] b/[refs]
index 58df23148bcd..aa87a250d79e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9752ee071117f32495da04d3cc9cb4453b5a46e
+refs/heads/master: 57ad869651d1d2f163a1c5ccb577ee794847fd77
diff --git a/trunk/drivers/staging/comedi/drivers/amplc_pc236.c b/trunk/drivers/staging/comedi/drivers/amplc_pc236.c
index ed253482d991..9bdd7a5628d8 100644
--- a/trunk/drivers/staging/comedi/drivers/amplc_pc236.c
+++ b/trunk/drivers/staging/comedi/drivers/amplc_pc236.c
@@ -96,14 +96,14 @@ unused.
 enum pc236_bustype { isa_bustype, pci_bustype };
 enum pc236_model { pc36at_model, pci236_model, anypci_model };
 
-typedef struct pc236_board_struct {
+struct pc236_board {
 	const char *name;
 	const char *fancy_name;
 	unsigned short devid;
 	enum pc236_bustype bustype;
 	enum pc236_model model;
-} pc236_board;
-static const pc236_board pc236_boards[] = {
+};
+static const struct pc236_board pc236_boards[] = {
 	{
 	      name:	"pc36at",
 	      fancy_name:"PC36AT",
@@ -143,7 +143,7 @@ MODULE_DEVICE_TABLE(pci, pc236_pci_table);
 /*
  * Useful for shorthand access to the particular board structure
  */
-#define thisboard ((const pc236_board *)dev->board_ptr)
+#define thisboard ((const struct pc236_board *)dev->board_ptr)
 
 /* this structure is for data unique to this hardware driver.  If
    several hardware drivers keep similar information in this structure,
@@ -173,8 +173,8 @@ static struct comedi_driver driver_amplc_pc236 = {
       attach:pc236_attach,
       detach:pc236_detach,
       board_name:&pc236_boards[0].name,
-      offset:sizeof(pc236_board),
-      num_names:sizeof(pc236_boards) / sizeof(pc236_board),
+      offset:sizeof(struct pc236_board),
+      num_names:sizeof(pc236_boards) / sizeof(struct pc236_board),
 };
 
 #ifdef CONFIG_COMEDI_PCI