staging: comedi: APCI1710_82x54: absorb private header

The header file APCI1710_82x54.h is only included by the source
file APCI1710_82x54.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/APCI1710_82x54.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c
index 64d286d3cd915cf157ed3fd940d2d9fa5d917ae4..d0702084caa281a5f0bf5c0c912f7c93f9ae460b 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c
@@ -18,7 +18,19 @@
   | Description :   APCI-1710 82X54 timer module                          |
 */
 
-#include "APCI1710_82x54.h"
+#define APCI1710_PCI_BUS_CLOCK                 0
+#define APCI1710_FRONT_CONNECTOR_INPUT         1
+#define APCI1710_TIMER_READVALUE               0
+#define APCI1710_TIMER_GETOUTPUTLEVEL          1
+#define APCI1710_TIMER_GETPROGRESSSTATUS       2
+#define APCI1710_TIMER_WRITEVALUE              3
+
+#define APCI1710_TIMER_READINTERRUPT           1
+#define APCI1710_TIMER_READALLTIMER            2
+
+#ifndef APCI1710_10MHZ
+#define APCI1710_10MHZ                         10
+#endif
 
 /*
 +----------------------------------------------------------------------------+

diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h
deleted file mode 100644 (file)
index 85a70f3..0000000
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h
+++ /dev/null
@@ -1,32 +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 APCI1710_PCI_BUS_CLOCK                         0
-#define APCI1710_FRONT_CONNECTOR_INPUT                 1
-#define APCI1710_TIMER_READVALUE               0
-#define APCI1710_TIMER_GETOUTPUTLEVEL          1
-#define APCI1710_TIMER_GETPROGRESSSTATUS       2
-#define APCI1710_TIMER_WRITEVALUE              3
-
-#define APCI1710_TIMER_READINTERRUPT           1
-#define APCI1710_TIMER_READALLTIMER            2
-
-/* BEGIN JK 27.10.03 : Add the possibility to use a 40 Mhz quartz */
-#ifndef APCI1710_10MHZ
-#define APCI1710_10MHZ 10
-#endif
-/* END JK 27.10.03 : Add the possibility to use a 40 Mhz quartz */