staging: comedi: hwrdv_apci3501: absorb private header

The header file hwdrv_apci3501.h is only included by the source
file hwrdv_apci3501.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_apci3501.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
index 609edd7ce8d2fde9d3549233da3a1ef172dff5a6..c92ec8fc932f4bf8cedad3d9ece4bb7543c0fd38 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
@@ -46,12 +46,43 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +----------+-----------+------------------------------------------------+
 */
 
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
-#include "hwdrv_apci3501.h"
+/* Card Specific information */
+#define APCI3501_ADDRESS_RANGE         255
+
+#define APCI3501_DIGITAL_IP            0x50
+#define APCI3501_DIGITAL_OP            0x40
+#define APCI3501_ANALOG_OUTPUT         0x00
+
+/* Analog Output related Defines */
+#define APCI3501_AO_VOLT_MODE          0
+#define APCI3501_AO_PROG               4
+#define APCI3501_AO_TRIG_SCS           8
+#define UNIPOLAR                       0
+#define BIPOLAR                                1
+#define MODE0                          0
+#define MODE1                          1
+
+/* Watchdog Related Defines */
+
+#define APCI3501_WATCHDOG              0x20
+#define APCI3501_TCW_SYNC_ENABLEDISABLE        0
+#define APCI3501_TCW_RELOAD_VALUE      4
+#define APCI3501_TCW_TIMEBASE          8
+#define APCI3501_TCW_PROG              12
+#define APCI3501_TCW_TRIG_STATUS       16
+#define APCI3501_TCW_IRQ               20
+#define APCI3501_TCW_WARN_TIMEVAL      24
+#define APCI3501_TCW_WARN_TIMEBASE     28
+#define ADDIDATA_TIMER                 0
+#define ADDIDATA_WATCHDOG              2
+
+/* ANALOG OUTPUT RANGE */
+static struct comedi_lrange range_apci3501_ao = {
+       2, {
+               BIP_RANGE(10),
+               UNI_RANGE(10)
+       }
+};
 
 /*
 +----------------------------------------------------------------------------+

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h
deleted file mode 100644 (file)
index 201fc7b..0000000
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h
+++ /dev/null
@@ -1,52 +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.
- */
-
-/* Card Specific information */
-#define APCI3501_ADDRESS_RANGE                   255
-
-#define APCI3501_DIGITAL_IP                       0x50
-#define APCI3501_DIGITAL_OP                       0x40
-#define APCI3501_ANALOG_OUTPUT                    0x00
-
-/* Analog Output related Defines */
-#define APCI3501_AO_VOLT_MODE                     0
-#define APCI3501_AO_PROG                          4
-#define APCI3501_AO_TRIG_SCS                      8
-#define UNIPOLAR                                  0
-#define BIPOLAR                                   1
-#define MODE0                                     0
-#define MODE1                                     1
-/* ANALOG OUTPUT RANGE */
-static struct comedi_lrange range_apci3501_ao = { 2, {
-                                       BIP_RANGE(10),
-                                       UNI_RANGE(10)
-                                       }
-};
-
-/* Watchdog Related Defines */
-
-#define APCI3501_WATCHDOG                         0x20
-#define APCI3501_TCW_SYNC_ENABLEDISABLE           0
-#define APCI3501_TCW_RELOAD_VALUE                 4
-#define APCI3501_TCW_TIMEBASE                     8
-#define APCI3501_TCW_PROG                         12
-#define APCI3501_TCW_TRIG_STATUS                  16
-#define APCI3501_TCW_IRQ                          20
-#define APCI3501_TCW_WARN_TIMEVAL                 24
-#define APCI3501_TCW_WARN_TIMEBASE                28
-#define ADDIDATA_TIMER                            0
-#define ADDIDATA_WATCHDOG                         2