staging: comedi: addi-data: remove addi_amcc_s5933.h

Now that the PCI bus walking has been removed from the addi-data
drivers, the only differenced between addi_amcc_s9533.h and the
standard comedi amcc_s5933.h is the additional defines for the
apci3120 "ADDON RELATED ADDITIONS". Move those defines to
hwdrv_apci3120.c.

Modify all the addi-data drivers to then include the standard
comedi amcc_s5933.h header and delete the duplicate in addi-data.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h b/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
deleted file mode 100644 (file)
index bef7479..0000000
--- a/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
+++ /dev/null
@@ -1,193 +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.
- */
-
-/* Header file for AMCC  s 5933 */
-
-#ifndef _AMCC_S5933_H_
-#define _AMCC_S5933_H_
-
-#include "../../comedidev.h"
-
-/* written on base0 */
-#define FIFO_ADVANCE_ON_BYTE_2 0x20000000
-
-/* added for step 6 dma written on base2 */
-#define AMWEN_ENABLE           0x02
-
-#define A2P_FIFO_WRITE_ENABLE  0x01
-
-/* for transfer count enable bit */
-#define AGCSTS_TC_ENABLE       0x10000000
-
-/*
- * ADDON RELATED ADDITIONS
- */
-/* Constant */
-#define APCI3120_ENABLE_TRANSFER_ADD_ON_LOW            0x00
-#define APCI3120_ENABLE_TRANSFER_ADD_ON_HIGH           0x1200
-#define APCI3120_A2P_FIFO_MANAGEMENT                   0x04000400L
-#define APCI3120_AMWEN_ENABLE                          0x02
-#define APCI3120_A2P_FIFO_WRITE_ENABLE                 0x01
-#define APCI3120_FIFO_ADVANCE_ON_BYTE_2                        0x20000000L
-#define APCI3120_ENABLE_WRITE_TC_INT                   0x00004000L
-#define APCI3120_CLEAR_WRITE_TC_INT                    0x00040000L
-#define APCI3120_DISABLE_AMWEN_AND_A2P_FIFO_WRITE      0x0
-#define APCI3120_DISABLE_BUS_MASTER_ADD_ON             0x0
-#define APCI3120_DISABLE_BUS_MASTER_PCI                        0x0
-
-/* ADD_ON ::: this needed since apci supports 16 bit interface to add on */
-#define APCI3120_ADD_ON_AGCSTS_LOW     0x3C
-#define APCI3120_ADD_ON_AGCSTS_HIGH    (APCI3120_ADD_ON_AGCSTS_LOW + 2)
-#define APCI3120_ADD_ON_MWAR_LOW       0x24
-#define APCI3120_ADD_ON_MWAR_HIGH      (APCI3120_ADD_ON_MWAR_LOW + 2)
-#define APCI3120_ADD_ON_MWTC_LOW       0x058
-#define APCI3120_ADD_ON_MWTC_HIGH      (APCI3120_ADD_ON_MWTC_LOW + 2)
-
-/* AMCC */
-#define APCI3120_AMCC_OP_MCSR          0x3C
-#define APCI3120_AMCC_OP_REG_INTCSR    0x38
-
-/*
- * AMCC Operation Register Offsets - PCI
- */
-#define AMCC_OP_REG_OMB1               0x00
-#define AMCC_OP_REG_OMB2               0x04
-#define AMCC_OP_REG_OMB3               0x08
-#define AMCC_OP_REG_OMB4               0x0c
-#define AMCC_OP_REG_IMB1               0x10
-#define AMCC_OP_REG_IMB2               0x14
-#define AMCC_OP_REG_IMB3               0x18
-#define AMCC_OP_REG_IMB4               0x1c
-#define AMCC_OP_REG_FIFO               0x20
-#define AMCC_OP_REG_MWAR               0x24
-#define AMCC_OP_REG_MWTC               0x28
-#define AMCC_OP_REG_MRAR               0x2c
-#define AMCC_OP_REG_MRTC               0x30
-#define AMCC_OP_REG_MBEF               0x34
-#define AMCC_OP_REG_INTCSR             0x38
-/* int source */
-#define  AMCC_OP_REG_INTCSR_SRC                (AMCC_OP_REG_INTCSR + 2)
-/* FIFO ctrl */
-#define  AMCC_OP_REG_INTCSR_FEC                (AMCC_OP_REG_INTCSR + 3)
-#define AMCC_OP_REG_MCSR               0x3c
-/* Data in byte 2 */
-#define  AMCC_OP_REG_MCSR_NVDATA       (AMCC_OP_REG_MCSR + 2)
-/* Command in byte 3 */
-#define  AMCC_OP_REG_MCSR_NVCMD                (AMCC_OP_REG_MCSR + 3)
-
-#define AMCC_FIFO_DEPTH_DWORD  8
-#define AMCC_FIFO_DEPTH_BYTES  (8 * sizeof(u32))
-
-/*
- * AMCC Operation Registers Size - PCI
- */
-#define AMCC_OP_REG_SIZE        64     /* in bytes */
-
-/*
- * AMCC Operation Register Offsets - Add-on
- */
-#define AMCC_OP_REG_AIMB1      0x00
-#define AMCC_OP_REG_AIMB2      0x04
-#define AMCC_OP_REG_AIMB3      0x08
-#define AMCC_OP_REG_AIMB4      0x0c
-#define AMCC_OP_REG_AOMB1      0x10
-#define AMCC_OP_REG_AOMB2      0x14
-#define AMCC_OP_REG_AOMB3      0x18
-#define AMCC_OP_REG_AOMB4      0x1c
-#define AMCC_OP_REG_AFIFO      0x20
-#define AMCC_OP_REG_AMWAR      0x24
-#define AMCC_OP_REG_APTA       0x28
-#define AMCC_OP_REG_APTD       0x2c
-#define AMCC_OP_REG_AMRAR      0x30
-#define AMCC_OP_REG_AMBEF      0x34
-#define AMCC_OP_REG_AINT       0x38
-#define AMCC_OP_REG_AGCSTS     0x3c
-#define AMCC_OP_REG_AMWTC      0x58
-#define AMCC_OP_REG_AMRTC      0x5c
-
-/*
- * AMCC - Add-on General Control/Status Register
- */
-#define AGCSTS_CONTROL_MASK    0xfffff000
-#define  AGCSTS_NV_ACC_MASK    0xe0000000
-#define  AGCSTS_RESET_MASK     0x0e000000
-#define  AGCSTS_NV_DA_MASK     0x00ff0000
-#define  AGCSTS_BIST_MASK      0x0000f000
-#define AGCSTS_STATUS_MASK     0x000000ff
-#define  AGCSTS_TCZERO_MASK    0x000000c0
-#define  AGCSTS_FIFO_ST_MASK   0x0000003f
-
-#define AGCSTS_RESET_MBFLAGS   0x08000000
-#define AGCSTS_RESET_P2A_FIFO  0x04000000
-#define AGCSTS_RESET_A2P_FIFO  0x02000000
-#define AGCSTS_RESET_FIFOS     (AGCSTS_RESET_A2P_FIFO | AGCSTS_RESET_P2A_FIFO)
-
-#define AGCSTS_A2P_TCOUNT      0x00000080
-#define AGCSTS_P2A_TCOUNT      0x00000040
-
-#define AGCSTS_FS_P2A_EMPTY    0x00000020
-#define AGCSTS_FS_P2A_HALF     0x00000010
-#define AGCSTS_FS_P2A_FULL     0x00000008
-
-#define AGCSTS_FS_A2P_EMPTY    0x00000004
-#define AGCSTS_FS_A2P_HALF     0x00000002
-#define AGCSTS_FS_A2P_FULL     0x00000001
-
-/*
- * AMCC - Add-on Interrupt Control/Status Register
- */
-#define AINT_INT_MASK          0x00ff0000
-#define AINT_SEL_MASK          0x0000ffff
-#define  AINT_IS_ENSEL_MASK    0x00001f1f
-
-#define AINT_INT_ASSERTED      0x00800000
-#define AINT_BM_ERROR          0x00200000
-#define AINT_BIST_INT          0x00100000
-
-#define AINT_RT_COMPLETE       0x00080000
-#define AINT_WT_COMPLETE       0x00040000
-
-#define AINT_OUT_MB_INT                0x00020000
-#define AINT_IN_MB_INT         0x00010000
-
-#define AINT_READ_COMPL                0x00008000
-#define AINT_WRITE_COMPL       0x00004000
-
-#define AINT_OMB_ENABLE        0x00001000
-#define AINT_OMB_SELECT        0x00000c00
-#define AINT_OMB_BYTE          0x00000300
-
-#define AINT_IMB_ENABLE        0x00000010
-#define AINT_IMB_SELECT        0x0000000c
-#define AINT_IMB_BYTE          0x00000003
-
-/* Enable Bus Mastering */
-#define EN_A2P_TRANSFERS       0x00000400
-/* FIFO Flag Reset */
-#define RESET_A2P_FLAGS                0x04000000L
-/* FIFO Relative Priority */
-#define A2P_HI_PRIORITY                0x00000100L
-/* Identify Interrupt Sources */
-#define ANY_S593X_INT          0x00800000L
-#define READ_TC_INT            0x00080000L
-#define WRITE_TC_INT           0x00040000L
-#define IN_MB_INT              0x00020000L
-#define MASTER_ABORT_INT       0x00100000L
-#define TARGET_ABORT_INT       0x00200000L
-#define BUS_MASTER_INT         0x00200000L
-
-#endif

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h
index 97760cc73f1c1ed33e80557321e2c66ac88a4812..7419f3440255b04706256586ca198cee2063ceff 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.h
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h
@@ -31,7 +31,6 @@
 #include <linux/kmod.h>
 #include <linux/uaccess.h>
 #include "../../comedidev.h"
-#include "addi_amcc_s5933.h"
 
 #define ERROR  -1
 #define SUCCESS        1

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index a60d8dc6441d6282d9bccf259c24a7a5bf10d590..47ec2083c58d8c8a3c886ecfc321ee8d711d6ad0 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -44,6 +44,37 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +----------+-----------+------------------------------------------------+
 */
 
+/*
+ * ADDON RELATED ADDITIONS
+ */
+/* Constant */
+#define APCI3120_ENABLE_TRANSFER_ADD_ON_LOW            0x00
+#define APCI3120_ENABLE_TRANSFER_ADD_ON_HIGH           0x1200
+#define APCI3120_A2P_FIFO_MANAGEMENT                   0x04000400L
+#define APCI3120_AMWEN_ENABLE                          0x02
+#define APCI3120_A2P_FIFO_WRITE_ENABLE                 0x01
+#define APCI3120_FIFO_ADVANCE_ON_BYTE_2                        0x20000000L
+#define APCI3120_ENABLE_WRITE_TC_INT                   0x00004000L
+#define APCI3120_CLEAR_WRITE_TC_INT                    0x00040000L
+#define APCI3120_DISABLE_AMWEN_AND_A2P_FIFO_WRITE      0x0
+#define APCI3120_DISABLE_BUS_MASTER_ADD_ON             0x0
+#define APCI3120_DISABLE_BUS_MASTER_PCI                        0x0
+
+/* ADD_ON ::: this needed since apci supports 16 bit interface to add on */
+#define APCI3120_ADD_ON_AGCSTS_LOW     0x3C
+#define APCI3120_ADD_ON_AGCSTS_HIGH    (APCI3120_ADD_ON_AGCSTS_LOW + 2)
+#define APCI3120_ADD_ON_MWAR_LOW       0x24
+#define APCI3120_ADD_ON_MWAR_HIGH      (APCI3120_ADD_ON_MWAR_LOW + 2)
+#define APCI3120_ADD_ON_MWTC_LOW       0x058
+#define APCI3120_ADD_ON_MWTC_HIGH      (APCI3120_ADD_ON_MWTC_LOW + 2)
+
+/* AMCC */
+#define APCI3120_AMCC_OP_MCSR          0x3C
+#define APCI3120_AMCC_OP_REG_INTCSR    0x38
+
+/* for transfer count enable bit */
+#define AGCSTS_TC_ENABLE       0x10000000
+
 /* used for test on mixture of BIP/UNI ranges */
 #define APCI3120_BIPOLAR_RANGES                4
 

diff --git a/drivers/staging/comedi/drivers/addi_apci_035.c b/drivers/staging/comedi/drivers/addi_apci_035.c
index 5403ae838f701cd6508fcf6b6eec96831aa738c8..43b83cf48107116690f7e99bc5d19fb72da7db46 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_035.c
+++ b/drivers/staging/comedi/drivers/addi_apci_035.c
@@ -1,8 +1,8 @@
 #include "../comedidev.h"
 #include "comedi_fc.h"
+#include "amcc_s5933.h"
 
 #include "addi-data/addi_common.h"
-#include "addi-data/addi_amcc_s5933.h"
 
 #define ADDIDATA_WATCHDOG 2    /*  Or shold it be something else */
 

diff --git a/drivers/staging/comedi/drivers/addi_apci_1032.c b/drivers/staging/comedi/drivers/addi_apci_1032.c
index 2b63d0c3894666f261f5ad7ecf8b41e803431d04..1db3e15ed4babbe418843b40e98278ea3616ccb8 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1032.c
@@ -1,8 +1,8 @@
 #include "../comedidev.h"
 #include "comedi_fc.h"
+#include "amcc_s5933.h"
 
 #include "addi-data/addi_common.h"
-#include "addi-data/addi_amcc_s5933.h"
 
 #include "addi-data/addi_eeprom.c"
 #include "addi-data/hwdrv_apci1032.c"

diff --git a/drivers/staging/comedi/drivers/addi_apci_1500.c b/drivers/staging/comedi/drivers/addi_apci_1500.c
index 804ce736c487053359c67f37edc1880e9c22909b..4fe98e5ce75f0096a57d9c55a2de148d1097ba23 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1500.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1500.c
@@ -1,8 +1,8 @@
 #include "../comedidev.h"
 #include "comedi_fc.h"
+#include "amcc_s5933.h"
 
 #include "addi-data/addi_common.h"
-#include "addi-data/addi_amcc_s5933.h"
 
 #include "addi-data/addi_eeprom.c"
 #include "addi-data/hwdrv_apci1500.c"

diff --git a/drivers/staging/comedi/drivers/addi_apci_1516.c b/drivers/staging/comedi/drivers/addi_apci_1516.c
index 480c285a8749f75a6631f9a324d36394a440475d..59c0c65ac1898a987d6baf921764f53e771d1ce3 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1516.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1516.c
@@ -1,8 +1,8 @@
 #include "../comedidev.h"
 #include "comedi_fc.h"
+#include "amcc_s5933.h"
 
 #include "addi-data/addi_common.h"
-#include "addi-data/addi_amcc_s5933.h"
 
 #include "addi-data/addi_eeprom.c"
 #include "addi-data/hwdrv_apci1516.c"

diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c
index 10a7dbcbf9951ba40ddab09787de69c979454900..1dcaadade21c8e46a9b66a73c9082cd20966352e 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -1,8 +1,8 @@
 #include "../comedidev.h"
 #include "comedi_fc.h"
+#include "amcc_s5933.h"
 
 #include "addi-data/addi_common.h"
-#include "addi-data/addi_amcc_s5933.h"
 
 #include "addi-data/addi_eeprom.c"
 #include "addi-data/hwdrv_apci1564.c"

diff --git a/drivers/staging/comedi/drivers/addi_apci_16xx.c b/drivers/staging/comedi/drivers/addi_apci_16xx.c
index b00e1a47cfff47dbbae8e7a156c1d9248de34021..14283aad0e420bfef405b94e5dd2dbc4e82fc3e4 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_16xx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_16xx.c
@@ -1,8 +1,8 @@
 #include "../comedidev.h"
 #include "comedi_fc.h"
+#include "amcc_s5933.h"
 
 #include "addi-data/addi_common.h"
-#include "addi-data/addi_amcc_s5933.h"
 
 #include "addi-data/addi_eeprom.c"
 #include "addi-data/hwdrv_apci16xx.c"

diff --git a/drivers/staging/comedi/drivers/addi_apci_1710.c b/drivers/staging/comedi/drivers/addi_apci_1710.c
index 8fae5b2f4f7fe687cfcd11604050eba8a53696f5..6337aceaf24657d8709680c97d8d450698cd8c13 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1710.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1710.c
@@ -2,9 +2,9 @@
 
 #include "../comedidev.h"
 #include "comedi_fc.h"
+#include "amcc_s5933.h"
 
 #include "addi-data/addi_common.h"
-#include "addi-data/addi_amcc_s5933.h"
 
 static void fpu_begin(void)
 {

diff --git a/drivers/staging/comedi/drivers/addi_apci_2016.c b/drivers/staging/comedi/drivers/addi_apci_2016.c
index e0420860a4dc7674fdeafb1bc2564faa3dad35c3..7c71981de7df460e6b04dee72ea244432b7b9912 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_2016.c
+++ b/drivers/staging/comedi/drivers/addi_apci_2016.c
@@ -1,8 +1,8 @@
 #include "../comedidev.h"
 #include "comedi_fc.h"
+#include "amcc_s5933.h"
 
 #include "addi-data/addi_common.h"
-#include "addi-data/addi_amcc_s5933.h"
 
 #include "addi-data/addi_eeprom.c"
 #include "addi-data/hwdrv_apci2016.c"

diff --git a/drivers/staging/comedi/drivers/addi_apci_2032.c b/drivers/staging/comedi/drivers/addi_apci_2032.c
index fd415248fb27cce1828d63b73adb8d87ab0a7336..92650480cd3a1a4f20dd9bb411ce29c43dfe1bf1 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_2032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_2032.c
@@ -1,8 +1,8 @@
 #include "../comedidev.h"
 #include "comedi_fc.h"
+#include "amcc_s5933.h"
 
 #include "addi-data/addi_common.h"
-#include "addi-data/addi_amcc_s5933.h"
 
 #include "addi-data/addi_eeprom.c"
 #include "addi-data/hwdrv_apci2032.c"

diff --git a/drivers/staging/comedi/drivers/addi_apci_2200.c b/drivers/staging/comedi/drivers/addi_apci_2200.c
index 3d4c9a9a840e24f8573ea66f65697dfb6cb422b9..becb2b4d11cd2da08c2430c9c617b01be8a65509 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_2200.c
+++ b/drivers/staging/comedi/drivers/addi_apci_2200.c
@@ -1,8 +1,8 @@
 #include "../comedidev.h"
 #include "comedi_fc.h"
+#include "amcc_s5933.h"
 
 #include "addi-data/addi_common.h"
-#include "addi-data/addi_amcc_s5933.h"
 
 #include "addi-data/addi_eeprom.c"
 #include "addi-data/hwdrv_apci2200.c"

diff --git a/drivers/staging/comedi/drivers/addi_apci_3001.c b/drivers/staging/comedi/drivers/addi_apci_3001.c
index c875f8cdafda8fcdcb7b51057b1e3ccb7e61db39..90506a3d1dc42659a7a37d5a3f7e18fffa00b20e 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3001.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3001.c
@@ -1,8 +1,8 @@
 #include "../comedidev.h"
 #include "comedi_fc.h"
+#include "amcc_s5933.h"
 
 #include "addi-data/addi_common.h"
-#include "addi-data/addi_amcc_s5933.h"
 
 #include "addi-data/addi_eeprom.c"
 #include "addi-data/hwdrv_apci3120.c"

diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index e027f4709cad70265635e99a65fb147481124879..5db6bfc0e22562bb4fce7ea8ba61bae5023c8109 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -1,8 +1,8 @@
 #include "../comedidev.h"
 #include "comedi_fc.h"
+#include "amcc_s5933.h"
 
 #include "addi-data/addi_common.h"
-#include "addi-data/addi_amcc_s5933.h"
 
 #define CONFIG_APCI_3120 1
 

diff --git a/drivers/staging/comedi/drivers/addi_apci_3200.c b/drivers/staging/comedi/drivers/addi_apci_3200.c
index 28def40b83012e3b8820f2a09723478a9dec635f..926fd79c11b090f9ff4c48887fa6e11c5212bc02 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3200.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3200.c
@@ -2,9 +2,9 @@
 
 #include "../comedidev.h"
 #include "comedi_fc.h"
+#include "amcc_s5933.h"
 
 #include "addi-data/addi_common.h"
-#include "addi-data/addi_amcc_s5933.h"
 
 static void fpu_begin(void)
 {

diff --git a/drivers/staging/comedi/drivers/addi_apci_3300.c b/drivers/staging/comedi/drivers/addi_apci_3300.c
index c57cacf0b32e4e139fa4466937d5b7892bb3071e..e57ef667c8b94be6ce6f4b489e38206cb444ba1f 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3300.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3300.c
@@ -2,9 +2,9 @@
 
 #include "../comedidev.h"
 #include "comedi_fc.h"
+#include "amcc_s5933.h"
 
 #include "addi-data/addi_common.h"
-#include "addi-data/addi_amcc_s5933.h"
 
 static void fpu_begin(void)
 {

diff --git a/drivers/staging/comedi/drivers/addi_apci_3501.c b/drivers/staging/comedi/drivers/addi_apci_3501.c
index 35948161760a17bd68a4e36fda39b4cc9d7b6c92..14ee4e0c5a98c13b04d981233fc86bcf05cb85a2 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3501.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3501.c
@@ -1,8 +1,8 @@
 #include "../comedidev.h"
 #include "comedi_fc.h"
+#include "amcc_s5933.h"
 
 #include "addi-data/addi_common.h"
-#include "addi-data/addi_amcc_s5933.h"
 
 #include "addi-data/addi_eeprom.c"
 #include "addi-data/hwdrv_apci3501.c"

diff --git a/drivers/staging/comedi/drivers/addi_apci_3xxx.c b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
index 22b13987ea3dc776fd933570ef2c6f71dee4e7ab..00c972e140f7d6094a304f8257d079cddd8ab92f 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3xxx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
@@ -1,8 +1,8 @@
 #include "../comedidev.h"
 #include "comedi_fc.h"
+#include "amcc_s5933.h"
 
 #include "addi-data/addi_common.h"
-#include "addi-data/addi_amcc_s5933.h"
 
 #include "addi-data/addi_eeprom.c"
 #include "addi-data/hwdrv_apci3xxx.c"