staging: comedi: hwrdv_apci1032: absorb private header

The header file hwdrv_apci1032.h is only included by the source
file hwrdv_apci1032.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_apci1032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
index e4e85f472f0f9955dea861162776911f1c574dbc..7b19b09a572c609ee236e08547d625a4c3e10171 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
@@ -46,13 +46,30 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +----------+-----------+------------------------------------------------+
 */
 
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
-#include "hwdrv_apci1032.h"
-#include <linux/delay.h>
+/*********      Definitions for APCI-1032 card  *****/
+
+#define APCI1032_ADDRESS_RANGE                 20
+/* DIGITAL INPUT DEFINE */
+
+#define APCI1032_DIGITAL_IP                    0
+#define APCI1032_DIGITAL_IP_INTERRUPT_MODE1    4
+#define APCI1032_DIGITAL_IP_INTERRUPT_MODE2    8
+#define APCI1032_DIGITAL_IP_IRQ                        16
+
+/* Digital Input IRQ Function Selection */
+#define ADDIDATA_OR                            0
+#define ADDIDATA_AND                           1
+
+/* Digital Input Interrupt Status */
+#define APCI1032_DIGITAL_IP_INTERRUPT_STATUS   12
+
+/* Digital Input Interrupt Enable Disable. */
+#define APCI1032_DIGITAL_IP_INTERRUPT_ENABLE   0x4
+#define APCI1032_DIGITAL_IP_INTERRUPT_DISABLE  0xfffffffb
+
+/* ADDIDATA Enable Disable */
+#define ADDIDATA_ENABLE                                1
+#define ADDIDATA_DISABLE                       0
 
 static unsigned int ui_InterruptStatus;
 

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h
deleted file mode 100644 (file)
index f0b32e8..0000000
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h
+++ /dev/null
@@ -1,42 +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.
- */
-
-/*********      Definitions for APCI-1032 card  *****/
-
-#define APCI1032_ADDRESS_RANGE  20
-/* DIGITAL INPUT DEFINE */
-
-#define APCI1032_DIGITAL_IP                     0
-#define APCI1032_DIGITAL_IP_INTERRUPT_MODE1     4
-#define APCI1032_DIGITAL_IP_INTERRUPT_MODE2     8
-#define APCI1032_DIGITAL_IP_IRQ                 16
-
-/* Digital Input IRQ Function Selection */
-#define ADDIDATA_OR                  0
-#define ADDIDATA_AND                 1
-
-/* Digital Input Interrupt Status */
-#define APCI1032_DIGITAL_IP_INTERRUPT_STATUS    12
-
-/* Digital Input Interrupt Enable Disable. */
-#define APCI1032_DIGITAL_IP_INTERRUPT_ENABLE    0x4
-#define APCI1032_DIGITAL_IP_INTERRUPT_DISABLE   0xFFFFFFFB
-
-/* ADDIDATA Enable Disable */
-
-#define ADDIDATA_ENABLE                            1
-#define ADDIDATA_DISABLE                           0