Small fixes for ISDN hisax build / config

Make the PCMCIA client drivers depend on hisax.o,
use the right CONFIG_ variable for hisax submodules,
handle the case of built-in hisax, modular hisax submodules.

diff --git a/drivers/isdn/Makefile b/drivers/isdn/Makefile
index 724e3328eb244d592181e296e555887da953f44b..8828cbc03f7c9a108828e0da5cf4124887c61d3f 100644 (file)
--- a/drivers/isdn/Makefile
+++ b/drivers/isdn/Makefile
@@ -6,7 +6,7 @@ O_TARGET        := vmlinux-obj.o
 
 # Object files in subdirectories
 
-mod-subdirs                            := i4l avmb1 eicon
+mod-subdirs                            := i4l hisax avmb1 eicon
 subdir-$(CONFIG_ISDN)                  += i4l
 subdir-$(CONFIG_ISDN_DIVERSION)                += divert
 subdir-$(CONFIG_ISDN_DRV_HISAX)                += hisax

diff --git a/drivers/isdn/hisax/Config.in b/drivers/isdn/hisax/Config.in
index 7060db036a45ee795025f02391cfe44df9b48808..6cd6b8d209cfa3bc7ec8ef7e6546039493c305ab 100644 (file)
--- a/drivers/isdn/hisax/Config.in
+++ b/drivers/isdn/hisax/Config.in
@@ -49,12 +49,12 @@ if [ "$CONFIG_ISDN_DRV_HISAX" != "n" ]; then
    fi
    bool '  HiSax debugging' CONFIG_HISAX_DEBUG
 
-   dep_tristate 'Sedlbauer PCMCIA cards' CONFIG_HISAX_SEDLBAUER_CS $CONFIG_PCMCIA
-   dep_tristate 'ELSA PCMCIA MicroLink cards' CONFIG_HISAX_ELSA_CS $CONFIG_PCMCIA
-   dep_tristate 'ST5481 USB ISDN modem (EXPERIMENTAL)' CONFIG_HISAX_ST5481 $CONFIG_HISAX $CONFIG_USB $CONFIG_EXPERIMENTAL
-   dep_tristate 'AVM Fritz!Card PCI/PCIv2/PnP support (EXPERIMENTAL)' CONFIG_HISAX_FRITZ_PCIPNP $CONFIG_HISAX $CONFIG_EXPERIMENTAL
-   dep_tristate 'AVM Fritz!Card classic support (EXPERIMENTAL)' CONFIG_HISAX_FRITZ_CLASSIC $CONFIG_HISAX $CONFIG_EXPERIMENTAL
-   dep_tristate 'HFC PCI support (EXPERIMENTAL)' CONFIG_HISAX_HFCPCI $CONFIG_HISAX $CONFIG_EXPERIMENTAL
+   dep_tristate 'Sedlbauer PCMCIA cards'                              CONFIG_HISAX_SEDLBAUER_CS  $CONFIG_DRV_ISDN_HISAX $CONFIG_PCMCIA
+   dep_tristate 'ELSA PCMCIA MicroLink cards'                         CONFIG_HISAX_ELSA_CS       $CONFIG_DRV_ISDN_HISAX $CONFIG_PCMCIA
+   dep_tristate 'ST5481 USB ISDN modem (EXPERIMENTAL)'                CONFIG_HISAX_ST5481        $CONFIG_DRV_ISDN_HISAX $CONFIG_USB $CONFIG_EXPERIMENTAL
+   dep_tristate 'AVM Fritz!Card PCI/PCIv2/PnP support (EXPERIMENTAL)' CONFIG_HISAX_FRITZ_PCIPNP  $CONFIG_DRV_ISDN_HISAX $CONFIG_EXPERIMENTAL
+   dep_tristate 'AVM Fritz!Card classic support (EXPERIMENTAL)'       CONFIG_HISAX_FRITZ_CLASSIC $CONFIG_DRV_ISDN_HISAX  $CONFIG_EXPERIMENTAL
+   dep_tristate 'HFC PCI support (EXPERIMENTAL)'                      CONFIG_HISAX_HFCPCI        $CONFIG_DRV_ISDN_HISAX $CONFIG_EXPERIMENTAL
 fi
 endmenu