staging: comedi: APCI1710_Ssi: absorb private header
authorH Hartley Sweeten <hartleys@visionengravers.com>
Wed, 31 Oct 2012 00:00:21 +0000 (17:00 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 31 Oct 2012 22:15:55 +0000 (15:15 -0700)
The header file APCI1710_Ssi.h is only included by the source
file APCI1710_Ssi.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>
drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c
drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h [deleted file]

index 00f8dc38186e2e97ea90335ec54fd80d21185369..1e05732e9f3d52d9aac5b499d93d6b68128327be 100644 (file)
@@ -40,13 +40,20 @@ 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_BINARY_MODE           0x1
+#define APCI1710_GRAY_MODE             0x0
+
+#define APCI1710_SSI_READ1VALUE                1
+#define APCI1710_SSI_READALLVALUE      2
 
-#include "APCI1710_Ssi.h"
+#define APCI1710_SSI_SET_CHANNELON     0
+#define APCI1710_SSI_SET_CHANNELOFF    1
+#define APCI1710_SSI_READ_1CHANNEL     2
+#define APCI1710_SSI_READ_ALLCHANNEL   3
 
 /*
 +----------------------------------------------------------------------------+
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h
deleted file mode 100644 (file)
index c4f6565..0000000
+++ /dev/null
@@ -1,31 +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_BINARY_MODE   0x1
-#define APCI1710_GRAY_MODE     0x0
-
-#define APCI1710_SSI_READ1VALUE                1
-#define APCI1710_SSI_READALLVALUE      2
-
-#define APCI1710_SSI_SET_CHANNELON     0
-#define APCI1710_SSI_SET_CHANNELOFF    1
-#define APCI1710_SSI_READ_1CHANNEL     2
-#define APCI1710_SSI_READ_ALLCHANNEL   3