diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-11-02 04:24:22 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-02 22:23:47 +0400 |
| commit | 33db6ebe0a124ef2ffb65c5f2ce4104e08fcec9c (patch) | |
| tree | 10f602f5db3912b186faea9004ed6e4a2b60f056 | |
| parent | 973781a821fe537ef1cb8ef227266faeed094ef6 (diff) | |
| download | linux-33db6ebe0a124ef2ffb65c5f2ce4104e08fcec9c.tar.xz | |
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c | 2 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/addi_apci_3120.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c index 47ec2083c58d..2514d685c142 100644 --- 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 979b8a9703ad..3c8a6a272c84 100644 --- 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" |