staging: comedi: hwrdv_apci3xxx: absorb private header
authorH Hartley Sweeten <hartleys@visionengravers.com>
Tue, 30 Oct 2012 23:58:14 +0000 (16:58 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 31 Oct 2012 22:15:54 +0000 (15:15 -0700)
The header file hwdrv_apci3xxx.h is only included by the source
file hwrdv_apci3xxx.c. Absorb the header into the source and
delete the header.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h [deleted file]

index 80974f27ff3006e7d8630c1d95873f21f4a2e110..23984bfcce3991c923071efeae5888adecacfe6b 100644 (file)
@@ -44,7 +44,40 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +----------+-----------+------------------------------------------------+
 */
 
-#include "hwdrv_apci3xxx.h"
+#ifndef COMEDI_SUBD_TTLIO
+#define COMEDI_SUBD_TTLIO      11      /* Digital Input Output But TTL */
+#endif
+
+#ifndef ADDIDATA_ENABLE
+#define ADDIDATA_ENABLE                                1
+#define ADDIDATA_DISABLE                       0
+#endif
+
+#define APCI3XXX_SINGLE                                0
+#define APCI3XXX_DIFF                          1
+#define APCI3XXX_CONFIGURATION                 0
+
+#define APCI3XXX_TTL_INIT_DIRECTION_PORT2      0
+
+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 struct comedi_lrange range_apci3XXX_ao = {
+       2, {
+               BIP_RANGE(10),
+               UNI_RANGE(10)
+       }
+};
 
 /*
 +----------------------------------------------------------------------------+
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h
deleted file mode 100644 (file)
index e10b7e5..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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 */
-#endif
-
-#ifndef ADDIDATA_ENABLE
-#define ADDIDATA_ENABLE  1
-#define ADDIDATA_DISABLE 0
-#endif
-
-#define APCI3XXX_SINGLE                              0
-#define APCI3XXX_DIFF                                1
-#define APCI3XXX_CONFIGURATION                       0
-
-#define APCI3XXX_TTL_INIT_DIRECTION_PORT2   0
-
-#ifdef __KERNEL__
-
-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 struct comedi_lrange range_apci3XXX_ao = { 2, {BIP_RANGE(10),
-                                                    UNI_RANGE(10)}
-};
-#endif