Move all of ISDN config into drivers/isdn/Config.in

diff --git a/arch/alpha/config.in b/arch/alpha/config.in
index 2a31630248eb8ef0f25af6aaf835ff11ec30b353..a1d04e7a4913b6709c9de9247c8077a9cb1e651e 100644 (file)
--- a/arch/alpha/config.in
+++ b/arch/alpha/config.in
@@ -324,14 +324,7 @@ fi
 
 source net/ax25/Config.in
 
-mainmenu_option next_comment
-comment 'ISDN subsystem'
-
-tristate 'ISDN support' CONFIG_ISDN
-if [ "$CONFIG_ISDN" != "n" ]; then
-  source drivers/isdn/Config.in
-fi
-endmenu
+source drivers/isdn/Config.in
 
 mainmenu_option next_comment
 comment 'Old CD-ROM drivers (not SCSI, not IDE)'

diff --git a/arch/arm/config.in b/arch/arm/config.in
index 5f17124059794850aec501e25392cad0d7da25d9..583331bc7569fa438da8625b090885f2095ae5eb 100644 (file)
--- a/arch/arm/config.in
+++ b/arch/arm/config.in
@@ -573,14 +573,7 @@ source drivers/ieee1394/Config.in
 
 source drivers/message/i2o/Config.in
 
-mainmenu_option next_comment
-comment 'ISDN subsystem'
-
-tristate 'ISDN support' CONFIG_ISDN
-if [ "$CONFIG_ISDN" != "n" ]; then
-   source drivers/isdn/Config.in
-fi
-endmenu
+source drivers/isdn/Config.in
 
 #
 # input before char - char/joystick depends on it. As does USB.

diff --git a/arch/cris/config.in b/arch/cris/config.in
index 9dccc71cc89ed48fd26bbd9b36429b267a29e84f..33c8ddd5c636395acb0c4454212f9c99531bf32c 100644 (file)
--- a/arch/cris/config.in
+++ b/arch/cris/config.in
@@ -185,15 +185,7 @@ source net/ax25/Config.in
 
 source net/irda/Config.in
 
-mainmenu_option next_comment
-comment 'ISDN subsystem'
-if [ "$CONFIG_NET" != "n" ]; then
-   tristate 'ISDN support' CONFIG_ISDN
-   if [ "$CONFIG_ISDN" != "n" ]; then
-      source drivers/isdn/Config.in
-   fi
-fi
-endmenu
+source drivers/isdn/Config.in
 
 mainmenu_option next_comment
 comment 'Old CD-ROM drivers (not SCSI, not IDE)'

diff --git a/arch/i386/config.in b/arch/i386/config.in
index 771fa43e2830c37d697da180ed22c5687adb7ca0..b81b86dc4d93377960b11816ad75adbe901c5304 100644 (file)
--- a/arch/i386/config.in
+++ b/arch/i386/config.in
@@ -348,15 +348,7 @@ source net/ax25/Config.in
 
 source net/irda/Config.in
 
-mainmenu_option next_comment
-comment 'ISDN subsystem'
-if [ "$CONFIG_NET" != "n" ]; then
-   tristate 'ISDN support' CONFIG_ISDN
-   if [ "$CONFIG_ISDN" != "n" ]; then
-      source drivers/isdn/Config.in
-   fi
-fi
-endmenu
+source drivers/isdn/Config.in
 
 mainmenu_option next_comment
 comment 'Old CD-ROM drivers (not SCSI, not IDE)'

diff --git a/arch/ia64/config.in b/arch/ia64/config.in
index 071dddd4aaade0b34a61aef3ec81679614204b8a..5c16767e121ac525d3e780a160ab95ea72166690 100644 (file)
--- a/arch/ia64/config.in
+++ b/arch/ia64/config.in
@@ -174,14 +174,7 @@ fi
 
 source net/ax25/Config.in
 
-mainmenu_option next_comment
-comment 'ISDN subsystem'
-
-tristate 'ISDN support' CONFIG_ISDN
-if [ "$CONFIG_ISDN" != "n" ]; then
-  source drivers/isdn/Config.in
-fi
-endmenu
+source drivers/isdn/Config.in
 
 mainmenu_option next_comment
 comment 'CD-ROM drivers (not for SCSI or IDE/ATAPI drives)'

diff --git a/arch/mips/config.in b/arch/mips/config.in
index bdbe88279e010bebea7b7eee443882eb384089cb..76fd83951f9a19b6a7ac17d601d916c3bbeffbcf 100644 (file)
--- a/arch/mips/config.in
+++ b/arch/mips/config.in
@@ -388,15 +388,7 @@ source net/ax25/Config.in
 
 source net/irda/Config.in
 
-mainmenu_option next_comment
-comment 'ISDN subsystem'
-if [ "$CONFIG_NET" != "n" ]; then
-   tristate 'ISDN support' CONFIG_ISDN
-   if [ "$CONFIG_ISDN" != "n" ]; then
-      source drivers/isdn/Config.in
-   fi
-fi
-endmenu
+source drivers/isdn/Config.in
 
 mainmenu_option next_comment
 comment 'Old CD-ROM drivers (not SCSI, not IDE)'

diff --git a/arch/mips64/config.in b/arch/mips64/config.in
index f3794f954ca311f42293715a404ede05f5ef50f6..63b5b1f69fbb37aad84f57145856b85de51efae2 100644 (file)
--- a/arch/mips64/config.in
+++ b/arch/mips64/config.in
@@ -181,16 +181,7 @@ source net/ax25/Config.in
 
 source net/irda/Config.in
 
-mainmenu_option next_comment
-comment 'ISDN subsystem'
-
-if [ "$CONFIG_NET" != "n" ]; then
-   tristate 'ISDN support' CONFIG_ISDN
-   if [ "$CONFIG_ISDN" != "n" ]; then
-      source drivers/isdn/Config.in
-   fi
-fi
-endmenu
+source drivers/isdn/Config.in
 
 mainmenu_option next_comment
 comment 'Old CD-ROM drivers (not SCSI, not IDE)'

diff --git a/arch/ppc/config.in b/arch/ppc/config.in
index 16690252ac8ff5f39a495e94f02be0c7af3b3804..d76dd7f78177ab76be7f48ab945e684e28043f8f 100644 (file)
--- a/arch/ppc/config.in
+++ b/arch/ppc/config.in
@@ -457,14 +457,7 @@ source net/ax25/Config.in
 
 source net/irda/Config.in
 
-mainmenu_option next_comment
-comment 'ISDN subsystem'
-
-tristate 'ISDN support' CONFIG_ISDN
-if [ "$CONFIG_ISDN" != "n" ]; then
-   source drivers/isdn/Config.in
-fi
-endmenu
+source drivers/isdn/Config.in
 
 mainmenu_option next_comment
 comment 'Old CD-ROM drivers (not SCSI, not IDE)'

diff --git a/arch/ppc64/config.in b/arch/ppc64/config.in
index 2334e2e5712e30d25d5d2d6eeb119b776472f753..16324fc7ef3e3de7d7b4089a1ea472b03410876a 100644 (file)
--- a/arch/ppc64/config.in
+++ b/arch/ppc64/config.in
@@ -124,14 +124,7 @@ source net/ax25/Config.in
 
 source net/irda/Config.in
 
-mainmenu_option next_comment
-comment 'ISDN subsystem'
-
-tristate 'ISDN support' CONFIG_ISDN
-if [ "$CONFIG_ISDN" != "n" ]; then
-   source drivers/isdn/Config.in
-fi
-endmenu
+source drivers/isdn/Config.in
 
 mainmenu_option next_comment
 comment 'Old CD-ROM drivers (not SCSI, not IDE)'

diff --git a/arch/sparc/config.in b/arch/sparc/config.in
index 7b2e4948467201209d0282a612d31cd90a6ce572..6a77dd2c34ea24ffe45eacde11261ecc63159e94 100644 (file)
--- a/arch/sparc/config.in
+++ b/arch/sparc/config.in
@@ -118,14 +118,7 @@ else
   define_bool CONFIG_BLK_DEV_HD n
 fi
 
-mainmenu_option next_comment
-comment 'ISDN subsystem'
-
-tristate 'ISDN support' CONFIG_ISDN
-if [ "$CONFIG_ISDN" != "n" ]; then
-   source drivers/isdn/Config.in
-fi
-endmenu
+source drivers/isdn/Config.in
 
 mainmenu_option next_comment
 comment 'SCSI support'

diff --git a/arch/x86_64/config.in b/arch/x86_64/config.in
index 50cdff1d07106cff111f1e08cc6b136a0ea1923e..188d887eed8cf44ce434845d6b0ec3e6c8b2235a 100644 (file)
--- a/arch/x86_64/config.in
+++ b/arch/x86_64/config.in
@@ -151,15 +151,7 @@ source net/ax25/Config.in
 
 source net/irda/Config.in
 
-mainmenu_option next_comment
-comment 'ISDN subsystem'
-if [ "$CONFIG_NET" != "n" ]; then
-   tristate 'ISDN support' CONFIG_ISDN
-   if [ "$CONFIG_ISDN" != "n" ]; then
-      source drivers/isdn/Config.in
-   fi
-fi
-endmenu
+source drivers/isdn/Config.in
 
 mainmenu_option next_comment
 comment 'Old CD-ROM drivers (not SCSI, not IDE)'

diff --git a/drivers/isdn/Config.in b/drivers/isdn/Config.in
index 62c59cdd481ef2eee34740452f68c2ac39701620..e37f69356adff5b04d83585d1c7c76efaba31ce5 100644 (file)
--- a/drivers/isdn/Config.in
+++ b/drivers/isdn/Config.in
@@ -2,7 +2,13 @@
 # ISDN device configuration
 #
 
-# only included if CONFIG_ISDN != n
+mainmenu_option next_comment
+comment 'ISDN subsystem'
+if [ "$CONFIG_NET" != "n" ]; then
+   tristate 'ISDN support' CONFIG_ISDN
+   if [ "$CONFIG_ISDN" != "n" ]; then
+
+### CONFIG_ISDN is set  #####################################################
 
 if [ "$CONFIG_INET" != "n" ]; then
    bool '  Support synchronous PPP' CONFIG_ISDN_PPP
@@ -152,3 +158,10 @@ fi
 dep_tristate '  Hypercope HYSDN cards (Champ, Ergo, Metro) support (module only)' CONFIG_HYSDN m $CONFIG_PROC_FS
 dep_mbool    '    HYSDN CAPI 2.0 support' CONFIG_HYSDN_CAPI $CONFIG_HYSDN $CONFIG_ISDN_CAPI
 endmenu
+
+### CONFIG_ISDN end #########################################################
+
+   fi
+fi
+endmenu
+