staging: comedi: APCI1710_Tor: absorb private header

The header file APCI1710_Tor.h is only included by the source
file APCI1710_Tor.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_Tor.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
index 3594a0487f70860ea8774cf36e1877ec991012c0..3bc9826ce40bbcacec42383c9b397422372da25d 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
@@ -52,13 +52,22 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +-----------------------------------------------------------------------+
 */
 
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
+#define APCI1710_30MHZ                 30
+#define APCI1710_33MHZ                 33
+#define APCI1710_40MHZ                 40
+
+#define APCI1710_GATE_INPUT            10
+
+#define APCI1710_TOR_SIMPLE_MODE       2
+#define APCI1710_TOR_DOUBLE_MODE       3
+#define APCI1710_TOR_QUADRUPLE_MODE    4
+
+#define APCI1710_SINGLE                        0
+#define APCI1710_CONTINUOUS            1
 
-#include "APCI1710_Tor.h"
+#define APCI1710_TOR_GETPROGRESSSTATUS 0
+#define APCI1710_TOR_GETCOUNTERVALUE   1
+#define APCI1710_TOR_READINTERRUPT     2
 
 /*
 +----------------------------------------------------------------------------+

diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h
deleted file mode 100644 (file)
index c6eb9d1..0000000
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h
+++ /dev/null
@@ -1,33 +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_30MHZ         30
-#define APCI1710_33MHZ         33
-#define APCI1710_40MHZ         40
-
-#define APCI1710_GATE_INPUT    10
-
-#define APCI1710_TOR_SIMPLE_MODE       2
-#define APCI1710_TOR_DOUBLE_MODE       3
-#define APCI1710_TOR_QUADRUPLE_MODE    4
-
-#define APCI1710_SINGLE                        0
-#define APCI1710_CONTINUOUS            1
-
-#define APCI1710_TOR_GETPROGRESSSTATUS 0
-#define APCI1710_TOR_GETCOUNTERVALUE   1
-#define APCI1710_TOR_READINTERRUPT     2