diff --git a/[refs] b/[refs]
index ca217fb8b838..97a56036728c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b95a0e17f416e1db80c26ecd8f3e894ad271d0b
+refs/heads/master: ff585603bdca766398e24037e9375b76507e2e60
diff --git a/trunk/drivers/staging/comedi/drivers/me4000.h b/trunk/drivers/staging/comedi/drivers/me4000.h
index 6e6dc0e8f25e..22a25a463b8b 100644
--- a/trunk/drivers/staging/comedi/drivers/me4000.h
+++ b/trunk/drivers/staging/comedi/drivers/me4000.h
@@ -360,14 +360,14 @@ struct me4000_ai_context {
 	unsigned long sample_counter_reg;
 };
 
-typedef struct me4000_dio_context {
+struct me4000_dio_context {
 	unsigned long dir_reg;
 	unsigned long ctrl_reg;
 	unsigned long port_0_reg;
 	unsigned long port_1_reg;
 	unsigned long port_2_reg;
 	unsigned long port_3_reg;
-} me4000_dio_context_t;
+};
 
 typedef struct me4000_cnt_context {
 	unsigned long ctrl_reg;