aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-06-15 09:18:55 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-15 14:46:49 -0700
commitdc348147a9e1ba84395d1e585d26af44f0ca4e29 (patch)
treeb6aa917306a2e50eb09c9ec9a45a2131ae523039
parentiio: buffer: Fix NULL pointer deref caused by empty scan mask (diff)
staging: comedi: fix Kconfig for COMEDI_PCMCIA_DRIVERS
The depends on PCCARD is redundant. All of the comedi PCMCIA drivers depend on PCMCIA which can only be enabled if PCCARD is enabled. Remove the extra depends check. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Tested-by: Ian Abbott <abbotti@mev.co.uk> Reported-by: Randy Dunlap <rdunlap@xenotime.net> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index 848cf7e3e8fd..2ca7f08bc5b9 100644
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -1097,7 +1097,7 @@ endif # COMEDI_PCI_DRIVERS
menuconfig COMEDI_PCMCIA_DRIVERS
tristate "Comedi PCMCIA drivers"
- depends on (PCMCIA || PCCARD)
+ depends on PCMCIA
---help---
Enable comedi PCMCIA and PCCARD drivers to be built