From 565eeff4d28a6b4add1e4de7341e1e63e30c39f3 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Mon, 22 Apr 2013 18:31:47 -0700
Subject: [PATCH] --- yaml --- r: 364181 b: refs/heads/master c:
 79a8c0e20eb9f0cb6aaaab87c56addff606d19fe h: refs/heads/master i:   364179:
 884033e8432ad1b0fbbea7ee0aec52bcc31bc3c6 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/staging/comedi/drivers/das800.c | 25 ++++++++-----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index b0465e0e77f7..986bfb5a96e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d0a66c0ccfd0ec23645ba2d92593c00d11bf936
+refs/heads/master: 79a8c0e20eb9f0cb6aaaab87c56addff606d19fe
diff --git a/trunk/drivers/staging/comedi/drivers/das800.c b/trunk/drivers/staging/comedi/drivers/das800.c
index 6e37033eab5b..3a4041d6f5e6 100644
--- a/trunk/drivers/staging/comedi/drivers/das800.c
+++ b/trunk/drivers/staging/comedi/drivers/das800.c
@@ -228,20 +228,8 @@ struct das800_private {
 	volatile int do_bits;	/* digital output bits */
 };
 
-static int das800_attach(struct comedi_device *dev,
-			 struct comedi_devconfig *it);
 static int das800_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
 
-static struct comedi_driver driver_das800 = {
-	.driver_name = "das800",
-	.module = THIS_MODULE,
-	.attach = das800_attach,
-	.detach = comedi_legacy_detach,
-	.num_names = ARRAY_SIZE(das800_boards),
-	.board_name = &das800_boards[0].name,
-	.offset = sizeof(struct das800_board),
-};
-
 static irqreturn_t das800_interrupt(int irq, void *d);
 static void enable_das800(struct comedi_device *dev);
 static void disable_das800(struct comedi_device *dev);
@@ -329,8 +317,6 @@ static int das800_probe(struct comedi_device *dev)
 	return -1;
 }
 
-module_comedi_driver(driver_das800);
-
 /* interrupt service routine */
 static irqreturn_t das800_interrupt(int irq, void *d)
 {
@@ -848,6 +834,17 @@ static int das800_set_frequency(struct comedi_device *dev)
 	return 0;
 }
 
+static struct comedi_driver driver_das800 = {
+	.driver_name	= "das800",
+	.module		= THIS_MODULE,
+	.attach		= das800_attach,
+	.detach		= comedi_legacy_detach,
+	.num_names	= ARRAY_SIZE(das800_boards),
+	.board_name	= &das800_boards[0].name,
+	.offset		= sizeof(struct das800_board),
+};
+module_comedi_driver(driver_das800);
+
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");
 MODULE_LICENSE("GPL");