staging: comedi: addi_apci_3120: remove CONFIG_APCI_3120 define

Now that the apci3001 and apci3120 boards are merged we can remove
this unnecessary define.

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/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index 47ec2083c58d8c8a3c886ecfc321ee8d711d6ad0..2514d685c1421a675a16dfec651c43315bcd21b8 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -2378,7 +2378,6 @@ static int i_APCI3120_InsnWriteDigitalOutput(struct comedi_device *dev,
 
 }
 
-#ifdef CONFIG_APCI_3120
 static int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev,
                                            struct comedi_subdevice *s,
                                            struct comedi_insn *insn,
@@ -2437,4 +2436,3 @@ static int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev,
 
        return insn->n;
 }
-#endif

diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index 979b8a9703adf57e2be91f28fa579edc0001af9a..3c8a6a272c849216f2912f00fcd2f38b2f0015d3 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -4,8 +4,6 @@
 
 #include "addi-data/addi_common.h"
 
-#define CONFIG_APCI_3120 1
-
 #include "addi-data/addi_eeprom.c"
 #include "addi-data/hwdrv_apci3120.c"
 #include "addi-data/addi_common.c"