staging: comedi: hwdrv_APCI1710: absorb private header

The header file hwdrv_APCi1710.h is only included by the source
file hwdrv_APCI1710.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>

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
index f28c737a173d2ee5c0236e86f0e1b0f1d2b23f4b..b05f8505c894fa69af48ae2955df3dcb1963021f 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
@@ -44,7 +44,35 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   |          |           |                                                |
   +----------+-----------+------------------------------------------------+
 */
-#include "hwdrv_APCI1710.h"
+
+#define COMEDI_SUBD_TTLIO              11      /* Digital Input Output But TTL */
+#define COMEDI_SUBD_PWM                        12      /* Pulse width Measurement */
+#define COMEDI_SUBD_SSI                        13      /* Synchronous serial interface */
+#define COMEDI_SUBD_TOR                        14      /* Tor counter */
+#define COMEDI_SUBD_CHRONO             15      /* Chrono meter */
+#define COMEDI_SUBD_PULSEENCODER       16      /* Pulse Encoder INP CPT */
+#define COMEDI_SUBD_INCREMENTALCOUNTER 17      /* Incremental Counter */
+
+#define APCI1710_BOARD_NAME            "apci1710"
+#define APCI1710_BOARD_DEVICE_ID       0x818F
+#define APCI1710_ADDRESS_RANGE         256
+#define APCI1710_CONFIG_ADDRESS_RANGE  8
+#define APCI1710_INCREMENTAL_COUNTER   0x53430000UL
+#define APCI1710_SSI_COUNTER           0x53490000UL
+#define APCI1710_TTL_IO                        0x544C0000UL
+#define APCI1710_DIGITAL_IO            0x44490000UL
+#define APCI1710_82X54_TIMER           0x49430000UL
+#define APCI1710_CHRONOMETER           0x43480000UL
+#define APCI1710_PULSE_ENCODER         0x495A0000UL
+#define APCI1710_TOR_COUNTER           0x544F0000UL
+#define APCI1710_PWM                   0x50570000UL
+#define APCI1710_ETM                   0x45540000UL
+#define APCI1710_CDA                   0x43440000UL
+#define APCI1710_DISABLE               0
+#define APCI1710_ENABLE                        1
+#define APCI1710_SYNCHRONOUS_MODE      1
+#define APCI1710_ASYNCHRONOUS_MODE     0
+
 #include "APCI1710_Inp_cpt.c"
 
 #include "APCI1710_Ssi.c"
@@ -56,6 +84,33 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 #include "APCI1710_Pwm.c"
 #include "APCI1710_INCCPT.c"
 
+static const struct comedi_lrange range_apci1710_ttl = {
+       4, {
+               BIP_RANGE(10),
+               BIP_RANGE(5),
+               BIP_RANGE(2),
+               BIP_RANGE(1)
+       }
+};
+
+static const struct comedi_lrange range_apci1710_ssi = {
+       4, {
+               BIP_RANGE(10),
+               BIP_RANGE(5),
+               BIP_RANGE(2),
+               BIP_RANGE(1)
+       }
+};
+
+static const struct comedi_lrange range_apci1710_inccpt = {
+       4, {
+               BIP_RANGE(10),
+               BIP_RANGE(5),
+               BIP_RANGE(2),
+               BIP_RANGE(1)
+       }
+};
+
 static void i_ADDI_AttachPCI1710(struct comedi_device *dev)
 {
        struct comedi_subdevice *s;

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h
deleted file mode 100644 (file)
index dab528e..0000000
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h
+++ /dev/null
@@ -1,70 +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.
- */
-
-#define COMEDI_SUBD_TTLIO              11      /* Digital Input Output But TTL */
-#define COMEDI_SUBD_PWM                        12      /* Pulse width Measurement */
-#define COMEDI_SUBD_SSI                        13      /* Synchronous serial interface */
-#define COMEDI_SUBD_TOR                        14      /* Tor counter */
-#define COMEDI_SUBD_CHRONO             15      /* Chrono meter */
-#define COMEDI_SUBD_PULSEENCODER       16      /* Pulse Encoder INP CPT */
-#define COMEDI_SUBD_INCREMENTALCOUNTER 17      /* Incremental Counter */
-
-#define APCI1710_BOARD_NAME            "apci1710"
-#define APCI1710_BOARD_DEVICE_ID       0x818F
-#define APCI1710_ADDRESS_RANGE         256
-#define APCI1710_CONFIG_ADDRESS_RANGE  8
-#define APCI1710_INCREMENTAL_COUNTER   0x53430000UL
-#define APCI1710_SSI_COUNTER           0x53490000UL
-#define APCI1710_TTL_IO                        0x544C0000UL
-#define APCI1710_DIGITAL_IO            0x44490000UL
-#define APCI1710_82X54_TIMER           0x49430000UL
-#define APCI1710_CHRONOMETER           0x43480000UL
-#define APCI1710_PULSE_ENCODER         0x495A0000UL
-#define APCI1710_TOR_COUNTER           0x544F0000UL
-#define APCI1710_PWM                   0x50570000UL
-#define APCI1710_ETM                   0x45540000UL
-#define APCI1710_CDA                   0x43440000UL
-#define APCI1710_DISABLE               0
-#define APCI1710_ENABLE                        1
-#define APCI1710_SYNCHRONOUS_MODE      1
-#define APCI1710_ASYNCHRONOUS_MODE     0
-
-/* MODULE INFO STRUCTURE */
-
-static const struct comedi_lrange range_apci1710_ttl = { 4, {
-                                                     BIP_RANGE(10),
-                                                     BIP_RANGE(5),
-                                                     BIP_RANGE(2),
-                                                     BIP_RANGE(1)
-                                                     }
-};
-
-static const struct comedi_lrange range_apci1710_ssi = { 4, {
-                                                     BIP_RANGE(10),
-                                                     BIP_RANGE(5),
-                                                     BIP_RANGE(2),
-                                                     BIP_RANGE(1)
-                                                     }
-};
-
-static const struct comedi_lrange range_apci1710_inccpt = { 4, {
-                                                        BIP_RANGE(10),
-                                                        BIP_RANGE(5),
-                                                        BIP_RANGE(2),
-                                                        BIP_RANGE(1)
-                                                        }
-};