Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[pandora-kernel.git] / drivers / staging / comedi / drivers / addi-data / hwdrv_apci3xxx.h

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h
index bf0f540..cce9e12 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h
@@ -1,26 +1,19 @@
-/**
-@verbatim
-
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
-
-        ADDI-DATA GmbH
-        Dieselstrasse 3
-        D-77833 Ottersweier
-        Tel: +19(0)7223/9493-0
-        Fax: +49(0)7223/9493-92
-        http://www.addi-data-com
-        info@addi-data.com
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-
-@endverbatim
-*/
+/*
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
+ *     ADDI-DATA GmbH
+ *     Dieselstrasse 3
+ *     D-77833 Ottersweier
+ *     Tel: +19(0)7223/9493-0
+ *     Fax: +49(0)7223/9493-92
+ *     http://www.addi-data.com
+ *     info@addi-data.com
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ */
 
 #ifndef COMEDI_SUBD_TTLIO
 #define COMEDI_SUBD_TTLIO   11 /* Digital Input Output But TTL */
@@ -39,31 +32,31 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 
 #ifdef __KERNEL__
 
-static const comedi_lrange range_apci3XXX_ai = { 8, {BIP_RANGE(10),
-                       BIP_RANGE(5),
-                       BIP_RANGE(2),
-                       BIP_RANGE(1),
-                       UNI_RANGE(10),
-                       UNI_RANGE(5),
-                       UNI_RANGE(2),
-       UNI_RANGE(1)}
+static const struct comedi_lrange range_apci3XXX_ai = { 8, {BIP_RANGE(10),
+                                                    BIP_RANGE(5),
+                                                    BIP_RANGE(2),
+                                                    BIP_RANGE(1),
+                                                    UNI_RANGE(10),
+                                                    UNI_RANGE(5),
+                                                    UNI_RANGE(2),
+                                                    UNI_RANGE(1)}
 };
 
-static const comedi_lrange range_apci3XXX_ttl = { 12, {BIP_RANGE(1),
-                       BIP_RANGE(1),
-                       BIP_RANGE(1),
-                       BIP_RANGE(1),
-                       BIP_RANGE(1),
-                       BIP_RANGE(1),
-                       BIP_RANGE(1),
-                       BIP_RANGE(1),
-                       BIP_RANGE(1),
-                       BIP_RANGE(1),
-                       BIP_RANGE(1),
-       BIP_RANGE(1)}
+static const struct comedi_lrange range_apci3XXX_ttl = { 12, {BIP_RANGE(1),
+                                                      BIP_RANGE(1),
+                                                      BIP_RANGE(1),
+                                                      BIP_RANGE(1),
+                                                      BIP_RANGE(1),
+                                                      BIP_RANGE(1),
+                                                      BIP_RANGE(1),
+                                                      BIP_RANGE(1),
+                                                      BIP_RANGE(1),
+                                                      BIP_RANGE(1),
+                                                      BIP_RANGE(1),
+                                                      BIP_RANGE(1)}
 };
 
-static const comedi_lrange range_apci3XXX_ao = { 2, {BIP_RANGE(10),
-       UNI_RANGE(10)}
+static const struct comedi_lrange range_apci3XXX_ao = { 2, {BIP_RANGE(10),
+                                                    UNI_RANGE(10)}
 };
 #endif