aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi/drivers/addi_apci_3xxx.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-10-31 16:58:40 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-01 08:43:25 -0700
commitbf36f012c7ddaff083bb0ef187feddf4d85507a0 (patch)
tree3902a3474f14e050f0f5148e509ed86c49ab84bd /drivers/staging/comedi/drivers/addi_apci_3xxx.c
parentstaging: comedi: addi-data: remove 'b_ValidDriver' from the private data (diff)
downloadlinux-dev-bf36f012c7ddaff083bb0ef187feddf4d85507a0.tar.xz
linux-dev-bf36f012c7ddaff083bb0ef187feddf4d85507a0.zip
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>
Diffstat (limited to 'drivers/staging/comedi/drivers/addi_apci_3xxx.c')
-rw-r--r--drivers/staging/comedi/drivers/addi_apci_3xxx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/addi_apci_3xxx.c b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
index 22b13987ea3d..00c972e140f7 100644
--- 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"