[PATCH] PATCH 2.5: kconfig spurious bool dependencies (2_2)

 Some instances of the "bool" statement have what appear to be
 dependencies like "dep_bool" after the 2nd argument, which are
 silently ignored by all current parsers.  I have either trimmed
 the arguments or converted the "bool" to "dep_bool" as seemed
 appropriate.

diff --git a/drivers/isdn/hisax/Config.in b/drivers/isdn/hisax/Config.in
index 6a303d4228ae10e42481ccd2c2f71859dfb3dc88..0d41ba9998df31fa1dd71a7ddbdd5814deaebc8d 100644 (file)
--- a/drivers/isdn/hisax/Config.in
+++ b/drivers/isdn/hisax/Config.in
@@ -14,27 +14,27 @@ 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 $CONFIG_ISA
+   dep_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 $CONFIG_ISA
+   dep_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 $CONFIG_ISA
+   dep_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 $CONFIG_ISA
-   bool '  TELEINT cards' CONFIG_HISAX_TELEINT $CONFIG_ISA
-   bool '  HFC-S based cards' CONFIG_HISAX_HFCS $CONFIG_ISA
+   dep_bool '  ASUSCOM ISA cards' CONFIG_HISAX_ASUSCOM $CONFIG_ISA
+   dep_bool '  TELEINT cards' CONFIG_HISAX_TELEINT $CONFIG_ISA
+   dep_bool '  HFC-S based cards' CONFIG_HISAX_HFCS $CONFIG_ISA
    bool '  Sedlbauer cards' CONFIG_HISAX_SEDLBAUER
-   bool '  USR Sportster internal TA' CONFIG_HISAX_SPORTSTER $CONFIG_ISA
-   bool '  MIC card' CONFIG_HISAX_MIC $CONFIG_ISA
+   dep_bool '  USR Sportster internal TA' CONFIG_HISAX_SPORTSTER $CONFIG_ISA
+   dep_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 $CONFIG_ISA
-   bool '  HST Saphir card' CONFIG_HISAX_HSTSAPHIR $CONFIG_ISA
+   dep_bool '  Siemens I-Surf card' CONFIG_HISAX_ISURF $CONFIG_ISA
+   dep_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