diff --git a/[refs] b/[refs]
index 4b8d917cbaa6..fb20cb8c3c6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb6b79dedb5e57a51761d5d08540b5e1127df571
+refs/heads/master: c6f5b4d587a46fc0713cecc30ef3993c59b7e41e
diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c
index 7b0951e9a0a5..b5e4bf1373e2 100644
--- a/trunk/drivers/staging/comedi/comedi_fops.c
+++ b/trunk/drivers/staging/comedi/comedi_fops.c
@@ -81,12 +81,6 @@ MODULE_PARM_DESC(comedi_default_buf_maxsize_kb,
 		 "default maximum size of asynchronous buffer in KiB (default "
 		 __MODULE_STRING(CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB) ")");
 
-struct comedi_file_info {
-	struct comedi_device *device;
-	struct comedi_subdevice *read_subdevice;
-	struct comedi_subdevice *write_subdevice;
-};
-
 static DEFINE_MUTEX(comedi_board_minor_table_lock);
 static struct comedi_device
 *comedi_board_minor_table[COMEDI_NUM_BOARD_MINORS];