From 514427d21cce1c0d376e26bd85590b66bba6a2de Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Fri, 27 Apr 2012 14:48:28 -0700
Subject: [PATCH] --- yaml --- r: 304522 b: refs/heads/master c:
 cb5f523779953d61221885988cecda0a2bc702cc h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/staging/comedi/drivers/rti802.c | 42 +++++++++----------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 0f2ad5cb2e90..25d248f69630 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69d7c49ea35cf3cba98549134ffec131c53dd865
+refs/heads/master: cb5f523779953d61221885988cecda0a2bc702cc
diff --git a/trunk/drivers/staging/comedi/drivers/rti802.c b/trunk/drivers/staging/comedi/drivers/rti802.c
index f59cb11590f6..21baf1a1c405 100644
--- a/trunk/drivers/staging/comedi/drivers/rti802.c
+++ b/trunk/drivers/staging/comedi/drivers/rti802.c
@@ -47,29 +47,6 @@ Configuration Options:
 #define RTI802_DATALOW 1
 #define RTI802_DATAHIGH 2
 
-static int rti802_attach(struct comedi_device *dev,
-			 struct comedi_devconfig *it);
-static int rti802_detach(struct comedi_device *dev);
-static struct comedi_driver driver_rti802 = {
-	.driver_name = "rti802",
-	.module = THIS_MODULE,
-	.attach = rti802_attach,
-	.detach = rti802_detach,
-};
-
-static int __init driver_rti802_init_module(void)
-{
-	return comedi_driver_register(&driver_rti802);
-}
-
-static void __exit driver_rti802_cleanup_module(void)
-{
-	comedi_driver_unregister(&driver_rti802);
-}
-
-module_init(driver_rti802_init_module);
-module_exit(driver_rti802_cleanup_module);
-
 struct rti802_private {
 	enum {
 		dac_2comp, dac_straight
@@ -162,6 +139,25 @@ static int rti802_detach(struct comedi_device *dev)
 	return 0;
 }
 
+static struct comedi_driver driver_rti802 = {
+	.driver_name	= "rti802",
+	.module		= THIS_MODULE,
+	.attach		= rti802_attach,
+	.detach		= rti802_detach,
+};
+
+static int __init driver_rti802_init_module(void)
+{
+	return comedi_driver_register(&driver_rti802);
+}
+module_init(driver_rti802_init_module);
+
+static void __exit driver_rti802_cleanup_module(void)
+{
+	comedi_driver_unregister(&driver_rti802);
+}
+module_exit(driver_rti802_cleanup_module);
+
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");
 MODULE_LICENSE("GPL");