2012-06-15 16:19:27

by Hartley Sweeten

Subject: [PATCH] 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(-)

diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index 848cf7e..2ca7f08 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

--
1.7.7

2012-06-15 17:51:28

by Ian Abbott

Subject: Re: [PATCH] staging: comedi: fix Kconfig for COMEDI_PCMCIA_DRIVERS

On 2012-06-15 17:18, H Hartley Sweeten wrote:
> 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]>

> ---
> drivers/staging/comedi/Kconfig | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
> index 848cf7e..2ca7f08 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
>


--
-=( Ian Abbott @ MEV Ltd. E-mail: <[email protected]> )=-
-=( Tel: +44 (0)161 477 1898 FAX: +44 (0)161 718 3587 )=-

2012-06-15 19:25:44

by Randy Dunlap

Subject: Re: [PATCH] staging: comedi: fix Kconfig for COMEDI_PCMCIA_DRIVERS

On 06/15/2012 09:18 AM, H Hartley Sweeten wrote:

> 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.

> ---
> drivers/staging/comedi/Kconfig | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
> index 848cf7e..2ca7f08 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
>



--
~Randy