Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[linux-drm-fsl-dcu.git] / drivers / staging / comedi / Kconfig

diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index ab9439fa1983dedc964544b0212e7f30ca7e473c..2d819d278b0ece94afad8f71be331180bbcd1bfb 100644 (file)
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -1,9 +1,9 @@
 config COMEDI
-       tristate "Data Acquision support (comedi)"
+       tristate "Data acquisition support (comedi)"
        default N
        depends on m
        ---help---
-         Enable support a wide range of data acquision devices
+         Enable support a wide range of data acquisition devices
          for Linux.
 
 config COMEDI_DEBUG
@@ -27,6 +27,13 @@ config COMEDI_PCI_DRIVERS
        ---help---
          Enable lots of comedi PCI drivers to be built
 
+config COMEDI_PCMCIA_DRIVERS
+       tristate "Comedi PCMCIA drivers"
+       depends on COMEDI && PCMCIAI
+       default N
+       ---help---
+         Enable lots of comedi PCMCIA drivers to be built
+
 config COMEDI_USB_DRIVERS
        tristate "Comedi USB drivers"
        depends on COMEDI && USB