diff --git a/[refs] b/[refs]
index 5f5137b8f97c..1112689cd24c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96a9319f71169a159a38113964f0745697d33929
+refs/heads/master: 853376e502283d740b7700524c822bb924b171b5
diff --git a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
index a7fdd66e0290..a5876f870968 100644
--- a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
+++ b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
@@ -270,7 +270,7 @@ enum dio200_model {
 	pc272e_model, pci272_model,
 };
 
-enum dio200_layout {
+enum dio200_layout_idx {
 #if DO_ISA
 	pc212_layout,
 	pc214_layout,
@@ -287,7 +287,7 @@ struct dio200_board {
 	unsigned short devid;
 	enum dio200_bustype bustype;
 	enum dio200_model model;
-	enum dio200_layout layout;
+	enum dio200_layout_idx layout;
 };
 
 static const struct dio200_board dio200_boards[] = {