ISDN: Make ISA-only drivers depend on CONFIG_ISA

diff --git a/drivers/isdn/act2000/Config.in b/drivers/isdn/act2000/Config.in
index 5fe42d1cc4d69c705cab0c76a0bc248c3178328a..78159f9e070ef325af267a8a501479e597623d3e 100644 (file)
--- a/drivers/isdn/act2000/Config.in
+++ b/drivers/isdn/act2000/Config.in
@@ -2,5 +2,5 @@
 # Config.in for IBM Active 2000 ISDN driver
 #
 
-dep_tristate       'IBM Active 2000 support' CONFIG_ISDN_DRV_ACT2000 $CONFIG_ISDN
+dep_tristate       'IBM Active 2000 support' CONFIG_ISDN_DRV_ACT2000 $CONFIG_ISDN $CONFIG_ISA
 

diff --git a/drivers/isdn/hardware/avm/Config.in b/drivers/isdn/hardware/avm/Config.in
index af37687e91b12f1409fd6b2b9f88260f6e4daf49..96f8f941c6447e59b0db2169753a834ffcfea887 100644 (file)
--- a/drivers/isdn/hardware/avm/Config.in
+++ b/drivers/isdn/hardware/avm/Config.in
@@ -8,12 +8,12 @@ comment 'Drivers for active AVM cards'
 bool 'Support AVM cards' CONFIG_CAPI_AVM
 
 if [ "$CONFIG_CAPI_AVM" != "n" ]; then
-   dep_tristate '  AVM B1 ISA support' CONFIG_ISDN_DRV_AVMB1_B1ISA               $CONFIG_ISDN_CAPI
+   dep_tristate '  AVM B1 ISA support' CONFIG_ISDN_DRV_AVMB1_B1ISA               $CONFIG_ISDN_CAPI $CONFIG_SA
 
    dep_tristate '  AVM B1 PCI support'            CONFIG_ISDN_DRV_AVMB1_B1PCI    $CONFIG_ISDN_CAPI $CONFIG_PCI
    dep_mbool    '    AVM B1 PCI V4 support'       CONFIG_ISDN_DRV_AVMB1_B1PCIV4  $CONFIG_ISDN_DRV_AVMB1_B1PCI
 
-   dep_tristate '  AVM T1/T1-B ISA support'       CONFIG_ISDN_DRV_AVMB1_T1ISA    $CONFIG_ISDN_CAPI
+   dep_tristate '  AVM T1/T1-B ISA support'       CONFIG_ISDN_DRV_AVMB1_T1ISA    $CONFIG_ISDN_CAPI $CONFIG_ISA
 
    dep_tristate '  AVM B1/M1/M2 PCMCIA support'   CONFIG_ISDN_DRV_AVMB1_B1PCMCIA $CONFIG_ISDN_CAPI
 

diff --git a/drivers/isdn/hisax/Config.in b/drivers/isdn/hisax/Config.in
index b89dc9dfb9dc3a2f6fc792b3ca27090647e9d2aa..7fb0df43c3bbc0483ad324f94f29ea102f14a6be 100644 (file)
--- a/drivers/isdn/hisax/Config.in
+++ b/drivers/isdn/hisax/Config.in
@@ -14,28 +14,28 @@ if [ "$CONFIG_ISDN_DRV_HISAX" != "n" ]; then
    bool '  HiSax Support for US NI1' CONFIG_HISAX_NI1
    int  '  Maximum number of cards supported by HiSax' CONFIG_HISAX_MAX_CARDS 8
    comment '  HiSax supported cards'
-   bool '  Teles 16.0/8.0' CONFIG_HISAX_16_0
+   bool '  Teles 16.0/8.0' CONFIG_HISAX_16_0 $CONFIG_ISA
    bool '  Teles 16.3 or PNP or PCMCIA' CONFIG_HISAX_16_3
    bool '  Teles PCI' CONFIG_HISAX_TELESPCI 
    bool '  Teles S0Box' CONFIG_HISAX_S0BOX 
-   bool '  AVM A1 (Fritz)' CONFIG_HISAX_AVM_A1
+   bool '  AVM A1 (Fritz)' CONFIG_HISAX_AVM_A1 $CONFIG_ISA
    bool '  AVM PnP/PCI (Fritz!PnP/PCI)' CONFIG_HISAX_FRITZPCI
    bool '  AVM A1 PCMCIA (Fritz)' CONFIG_HISAX_AVM_A1_PCMCIA
    bool '  Elsa cards' CONFIG_HISAX_ELSA
-   bool '  ITK ix1-micro Revision 2' CONFIG_HISAX_IX1MICROR2
+   bool '  ITK ix1-micro Revision 2' CONFIG_HISAX_IX1MICROR2 $CONFIG_ISA
    bool '  Eicon.Diehl Diva cards' CONFIG_HISAX_DIEHLDIVA
-   bool '  ASUSCOM ISA cards' CONFIG_HISAX_ASUSCOM
-   bool '  TELEINT cards' CONFIG_HISAX_TELEINT
-   bool '  HFC-S based cards' CONFIG_HISAX_HFCS
+   bool '  ASUSCOM ISA cards' CONFIG_HISAX_ASUSCOM $CONFIG_ISA
+   bool '  TELEINT cards' CONFIG_HISAX_TELEINT $CONFIG_ISA
+   bool '  HFC-S based cards' CONFIG_HISAX_HFCS $CONFIG_ISA
    bool '  Sedlbauer cards' CONFIG_HISAX_SEDLBAUER
-   bool '  USR Sportster internal TA' CONFIG_HISAX_SPORTSTER
-   bool '  MIC card' CONFIG_HISAX_MIC
+   bool '  USR Sportster internal TA' CONFIG_HISAX_SPORTSTER $CONFIG_ISA
+   bool '  MIC card' CONFIG_HISAX_MIC $CONFIG_ISA
    bool '  NETjet card' CONFIG_HISAX_NETJET
    bool '  NETspider U card' CONFIG_HISAX_NETJET_U
    bool '  Niccy PnP/PCI card' CONFIG_HISAX_NICCY
-   bool '  Siemens I-Surf card' CONFIG_HISAX_ISURF
-   bool '  HST Saphir card' CONFIG_HISAX_HSTSAPHIR
-   bool '  Telekom A4T card' CONFIG_HISAX_BKM_A4T
+   bool '  Siemens I-Surf card' CONFIG_HISAX_ISURF $CONFIG_ISA
+   bool '  HST Saphir card' CONFIG_HISAX_HSTSAPHIR $CONFIG_ISA
+   bool '  Telekom A4T card' CONFIG_HISAX_BKM_A4T 
    bool '  Scitel Quadro card' CONFIG_HISAX_SCT_QUADRO
    bool '  Gazel cards' CONFIG_HISAX_GAZEL
    bool '  HFC PCI-Bus cards' CONFIG_HISAX_HFC_PCI

diff --git a/drivers/isdn/icn/Config.in b/drivers/isdn/icn/Config.in
index 4e0ba9822e4857a5191a365a4c396247bfe115fd..99be93adf38ef25c8c1c3b0d9d32016b7bf486a8 100644 (file)
--- a/drivers/isdn/icn/Config.in
+++ b/drivers/isdn/icn/Config.in
@@ -2,4 +2,4 @@
 # Config.in for ICN ISDN driver
 #
 
-dep_tristate       'ICN 2B and 4B support' CONFIG_ISDN_DRV_ICN $CONFIG_ISDN
+dep_tristate       'ICN 2B and 4B support' CONFIG_ISDN_DRV_ICN $CONFIG_ISDN $CONFIG_ISA

diff --git a/drivers/isdn/pcbit/Config.in b/drivers/isdn/pcbit/Config.in
index 1555807d43021b59cd1af6ae771c64a54b7d8305..e3d09f96065f55e271c1ef45c6a05866c6b7018e 100644 (file)
--- a/drivers/isdn/pcbit/Config.in
+++ b/drivers/isdn/pcbit/Config.in
@@ -2,4 +2,4 @@
 # Config.in for PCBIT ISDN driver
 #
 
-dep_tristate       'PCBIT-D support' CONFIG_ISDN_DRV_PCBIT $CONFIG_ISDN
+dep_tristate       'PCBIT-D support' CONFIG_ISDN_DRV_PCBIT $CONFIG_ISDN $CONFIG_ISA

diff --git a/drivers/isdn/sc/Config.in b/drivers/isdn/sc/Config.in
index cacebb895803f75462a48e76712f41725e4048e1..08dc7b12d416ce04e7c5ee514ac7db1e6ebf468e 100644 (file)
--- a/drivers/isdn/sc/Config.in
+++ b/drivers/isdn/sc/Config.in
@@ -2,4 +2,4 @@
 # Config.in for Spellcaster ISDN driver
 #
 
-dep_tristate       'Spellcaster support' CONFIG_ISDN_DRV_SC $CONFIG_ISDN
+dep_tristate       'Spellcaster support' CONFIG_ISDN_DRV_SC $CONFIG_ISDN $CONFIG_ISA