Skip to contentSkip to conversation

staging: comedi: fix Kconfig for COMEDI_PCMCIA_DRIVERS

PATCH In review H Hartley Sweeten 3 participants 3 messages Jun 15, 2012 Staging

lore
Share & tools
lore

H Hartley Sweeten

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
Cc Ian Abbott <[email protected]>
Cc Frank Mori Hess <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
---
 drivers/staging/comedi/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/staging/comedi/Kconfig +1 -1
index 848cf7e..2ca7f08 100644
@@ -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
Signature · 1 line
1.7.7
Tested-by on v1 1/1
#1 lore raw
Quoted 8 lines · H Hartley Sweeten

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<[email protected]>
Cc Ian Abbott<[email protected]>
Cc Frank Mori Hess<[email protected]>
Cc Greg Kroah-Hartman<[email protected]>

I tested it with Randy's config from

Subject: Re: linux-next: Tree for Jun 14 (staging/comedi)
Message-ID: <[email protected]>

and make oldconfig no longer leaves CONFIG_COMEDI_NI_LABPC_CS, etc. defined, so it seems to work!

Thanks.

Tested-by Ian Abbott <[email protected]>
Quoted 17 lines
---
  drivers/staging/comedi/Kconfig |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
drivers/staging/comedi/Kconfig +1 -1
index 848cf7e..2ca7f08 100644
@@ -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
Signature · 2 lines
-=( Ian Abbott @ MEV Ltd.    E-mail: <[email protected]>        )=-
-=( Tel: +44 (0)161 477 1898   FAX: +44 (0)161 718 3587         )=-
Acked-by on v1 1/1
#2 lore raw
In reply to H Hartley Sweeten
Quoted 8 lines · H Hartley Sweeten

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 <[email protected]>
Cc Ian Abbott <[email protected]>
Cc Frank Mori Hess <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Reported-by Randy Dunlap <[email protected]>
Acked-by Randy Dunlap <[email protected]>

Thanks.

Quoted 17 lines
---
 drivers/staging/comedi/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/staging/comedi/Kconfig +1 -1
index 848cf7e..2ca7f08 100644
@@ -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
Signature · 1 line
~Randy