diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2012-03-26 16:57:28 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-10 11:16:13 -0700 |
| commit | 3e6be97ebbb0b45bb834670a45b343383d6de97f (patch) | |
| tree | 4c65e5a3b0942964dabdce136b1b88e061f5f734 /drivers/staging/comedi/Kconfig | |
| parent | 717ab674e261932ca642af838ef9eea111623682 (diff) | |
staging: comedi: amplc_pc263: separately configure ISA and PCI
The amplc_pc263 driver supports both ISA and PCI cards, but currently
it is only possible to select the driver if PCI is configured. This
patch splits the configuration to make the ISA and PCI parts seperately
selectable, and changes the driver to only include the selected ISA
and/or PCI board types.
Also fix a conditionally mismatched brace in pc263_detach().
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/Kconfig')
| -rw-r--r-- | drivers/staging/comedi/Kconfig | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig index df6eb2a9b94..391a713ff2b 100644 --- a/drivers/staging/comedi/Kconfig +++ b/drivers/staging/comedi/Kconfig @@ -233,6 +233,16 @@ config COMEDI_AMPLC_PC236_ISA To compile this driver as a module, choose M here: the module will be called amplc_pc236. +config COMEDI_AMPLC_PC263_ISA + tristate "Amplicon PC263 relay board support" + select COMEDI_AMPLC_PC263 + default N + ---help--- + Enable support for Amplicon PC263 ISA relay board. + + To compile this driver as a module, choose M here: the module will be + called amplc_pc263. + config COMEDI_RTI800 tristate "Analog Devices RTI-800/815 ISA card support" default N @@ -814,11 +824,12 @@ config COMEDI_AMPLC_PC236_PCI To compile this driver as a module, choose M here: the module will be called amplc_pc236. -config COMEDI_AMPLC_PC263 - tristate "Amplicon PC263 and PCI263 relay board support" +config COMEDI_AMPLC_PC263_PCI + tristate "Amplicon PCI263 relay board support" + select COMEDI_AMPLC_PC263 default N ---help--- - Enable support for Amplicon PC263 and PCI263 relay boards + Enable support for Amplicon PCI263 relay board. To compile this driver as a module, choose M here: the module will be called amplc_pc263. @@ -1414,3 +1425,7 @@ config COMEDI_AMPLC_PC236 def_tristate N depends on COMEDI select COMEDI_8255 + +config COMEDI_AMPLC_PC263 + def_tristate N + depends on COMEDI |