[PATCH 1/2] isdn: hisax: Merge Kconfig ifs

[PATCH 1/2] isdn: hisax: Merge Kconfig ifs

[Jean Delvare]

The first half of the HiSax config options is presented if
ISDN_DRV_HISAX!=n, while the second half of the options is presented
if ISDN_DRV_HISAX. That's the same, so merge both conditionals.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Karsten Keil <isdn@linux-pingi.de>
---
 drivers/isdn/hisax/Kconfig |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

--- a/drivers/isdn/hisax/Kconfig
+++ b/drivers/isdn/hisax/Kconfig
@@ -16,7 +16,7 @@ config ISDN_DRV_HISAX
 	  also to the configuration option of the driver for your particular
 	  card, below.
 
-if ISDN_DRV_HISAX!=n
+if ISDN_DRV_HISAX
 
 comment "D-channel protocol features"
 
@@ -348,10 +348,6 @@ config HISAX_ENTERNOW_PCI
 	  This enables HiSax support for the Formula-n enter:now PCI
 	  ISDN card.
 
-endif
-
-if ISDN_DRV_HISAX
-
 config HISAX_DEBUG
 	bool "HiSax debugging"
 	help

-- 
Jean Delvare
SUSE L3 Support

[PATCH 2/2] isdn: hisax: Drop duplicate Kconfig entry

[Jean Delvare]

There are 2 HISAX_AVM_A1_PCMCIA Kconfig entries. The kbuild system
ignores the second one, and apparently nobody noticed the problem so
far, so let's remove that second entry.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Karsten Keil <isdn@linux-pingi.de>
---
 drivers/isdn/hisax/Kconfig |    5 -----
 1 file changed, 5 deletions(-)

--- a/drivers/isdn/hisax/Kconfig
+++ b/drivers/isdn/hisax/Kconfig
@@ -416,11 +416,6 @@ config HISAX_FRITZ_PCIPNP
 	  (the latter also needs you to select "ISA Plug and Play support"
 	  from the menu "Plug and Play configuration")
 
-config HISAX_AVM_A1_PCMCIA
-	bool
-	depends on HISAX_AVM_A1_CS
-	default y
-
 endif
 
 endmenu

-- 
Jean Delvare
SUSE L3 Support

Re: [PATCH 1/2] isdn: hisax: Merge Kconfig ifs

[David Miller]

From: Jean Delvare <jdelvare@suse.de>
Date: Mon, 16 Jun 2014 10:09:37 +0200

> The first half of the HiSax config options is presented if
> ISDN_DRV_HISAX!=n, while the second half of the options is presented
> if ISDN_DRV_HISAX. That's the same, so merge both conditionals.
> 
> Signed-off-by: Jean Delvare <jdelvare@suse.de>

Applied.

Re: [PATCH 2/2] isdn: hisax: Drop duplicate Kconfig entry

[David Miller]

From: Jean Delvare <jdelvare@suse.de>
Date: Mon, 16 Jun 2014 10:13:55 +0200

> There are 2 HISAX_AVM_A1_PCMCIA Kconfig entries. The kbuild system
> ignores the second one, and apparently nobody noticed the problem so
> far, so let's remove that second entry.
> 
> Signed-off-by: Jean Delvare <jdelvare@suse.de>

Applied.