---

yaml --- r: 354259 b: refs/heads/master c: 6749ffa h: refs/heads/master i: 354257: 3d0588f 354255: 471427e v: v3
git-mirror · Jan 30, 2013 · 2809ca6 · 2809ca6
1 parent 0fcf693
commit 2809ca6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2e1be03ac1747cbb758fa146fe5cf364f306420
+refs/heads/master: 6749ffa84028b5283889eb68b9bbec2e27049722
diff --git a/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c b/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -77,8 +77,6 @@ NI manuals:
 
 static struct pcmcia_device *pcmcia_cur_dev;
 
-static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it);
-
 static const struct labpc_board_struct labpc_cs_boards[] = {
 	{
 	 .name = "daqcard-1200",
@@ -115,16 +113,6 @@ static const struct labpc_board_struct labpc_cs_boards[] = {
  */
 #define thisboard ((const struct labpc_board_struct *)dev->board_ptr)
 
-static struct comedi_driver driver_labpc_cs = {
-	.driver_name = "ni_labpc_cs",
-	.module = THIS_MODULE,
-	.attach = &labpc_attach,
-	.detach = &labpc_common_detach,
-	.num_names = ARRAY_SIZE(labpc_cs_boards),
-	.board_name = &labpc_cs_boards[0].name,
-	.offset = sizeof(struct labpc_board_struct),
-};
-
 static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
 	struct labpc_private *devpriv;
@@ -154,6 +142,16 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	return labpc_common_attach(dev, iobase, irq, 0);
 }
 
+static struct comedi_driver driver_labpc_cs = {
+	.driver_name	= "ni_labpc_cs",
+	.module		= THIS_MODULE,
+	.attach		= labpc_attach,
+	.detach		= labpc_common_detach,
+	.num_names	= ARRAY_SIZE(labpc_cs_boards),
+	.board_name	= &labpc_cs_boards[0].name,
+	.offset		= sizeof(struct labpc_board_struct),
+};
+
 static int labpc_pcmcia_config_loop(struct pcmcia_device *p_dev,
 				void *priv_data)
 {