diff --git a/[refs] b/[refs]
index 9c99cadfae45..5fef5a9eebfa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5e7ff89e660e8e1a0861062197f3fd4d7576c41
+refs/heads/master: aaefe848e056474a583b43c13c4891fbda50caa4
diff --git a/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c b/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c
index 84f437804669..253f735b3b4e 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c
@@ -225,16 +225,6 @@ static uint16_t mio_cs_win_in(struct comedi_device *dev, int addr)
 	return ret;
 }
 
-static int mio_cs_attach(struct comedi_device *dev,
-			 struct comedi_devconfig *it);
-static void mio_cs_detach(struct comedi_device *dev);
-static struct comedi_driver driver_ni_mio_cs = {
-	.driver_name = "ni_mio_cs",
-	.module = THIS_MODULE,
-	.attach = mio_cs_attach,
-	.detach = mio_cs_detach,
-};
-
 #include "ni_mio_common.c"
 
 static int ni_getboardtype(struct comedi_device *dev,
@@ -334,6 +324,13 @@ static int ni_getboardtype(struct comedi_device *dev,
 	return 0;
 }
 
+static struct comedi_driver driver_ni_mio_cs = {
+	.driver_name	= "ni_mio_cs",
+	.module		= THIS_MODULE,
+	.attach		= mio_cs_attach,
+	.detach		= mio_cs_detach,
+};
+
 static int mio_pcmcia_config_loop(struct pcmcia_device *p_dev, void *priv_data)
 {
 	int base, ret;