* [PATCH 1/2] isdn: hisax: Merge Kconfig ifs
@ 2014-06-16 8:09 Jean Delvare
2014-06-16 8:13 ` [PATCH 2/2] isdn: hisax: Drop duplicate Kconfig entry Jean Delvare
2014-06-17 4:31 ` [PATCH 1/2] isdn: hisax: Merge Kconfig ifs David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Jean Delvare @ 2014-06-16 8:09 UTC (permalink / raw)
To: netdev; +Cc: Karsten Keil
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/2] isdn: hisax: Drop duplicate Kconfig entry
2014-06-16 8:09 [PATCH 1/2] isdn: hisax: Merge Kconfig ifs Jean Delvare
@ 2014-06-16 8:13 ` Jean Delvare
2014-06-17 4:31 ` David Miller
2014-06-17 4:31 ` [PATCH 1/2] isdn: hisax: Merge Kconfig ifs David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Jean Delvare @ 2014-06-16 8:13 UTC (permalink / raw)
To: netdev; +Cc: Karsten Keil, Sam Ravnborg
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] isdn: hisax: Merge Kconfig ifs
2014-06-16 8:09 [PATCH 1/2] isdn: hisax: Merge Kconfig ifs Jean Delvare
2014-06-16 8:13 ` [PATCH 2/2] isdn: hisax: Drop duplicate Kconfig entry Jean Delvare
@ 2014-06-17 4:31 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2014-06-17 4:31 UTC (permalink / raw)
To: jdelvare; +Cc: netdev, isdn
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-06-17 4:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-16 8:09 [PATCH 1/2] isdn: hisax: Merge Kconfig ifs Jean Delvare
2014-06-16 8:13 ` [PATCH 2/2] isdn: hisax: Drop duplicate Kconfig entry Jean Delvare
2014-06-17 4:31 ` David Miller
2014-06-17 4:31 ` [PATCH 1/2] isdn: hisax: Merge Kconfig ifs David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).