Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / isdn / hisax / Kconfig

diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig
index 34ab5f7dcabc1daa4087893bde2c58c568687afa..7832d8ba8e444d9ae47a1af89b15f1756f7e8632 100644 (file)
--- a/drivers/isdn/hisax/Kconfig
+++ b/drivers/isdn/hisax/Kconfig
@@ -1,6 +1,5 @@
 
 menu "Passive cards"
 
 menu "Passive cards"

-       depends on ISDN_I4L

 
 config ISDN_DRV_HISAX
        tristate "HiSax SiemensChipSet driver support"
 
 config ISDN_DRV_HISAX
        tristate "HiSax SiemensChipSet driver support"


@@ -110,7 +109,7 @@ config HISAX_16_3
 
 config HISAX_TELESPCI
        bool "Teles PCI"
 
 config HISAX_TELESPCI
        bool "Teles PCI"

-       depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))
+       depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))

        help
          This enables HiSax support for the Teles PCI.
          See <file:Documentation/isdn/README.HiSax> on how to configure it.
        help
          This enables HiSax support for the Teles PCI.
          See <file:Documentation/isdn/README.HiSax> on how to configure it.


@@ -238,7 +237,7 @@ config HISAX_MIC
 
 config HISAX_NETJET
        bool "NETjet card"
 
 config HISAX_NETJET
        bool "NETjet card"

-       depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))
+       depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))

        help
          This enables HiSax support for the NetJet from Traverse
          Technologies.
        help
          This enables HiSax support for the NetJet from Traverse
          Technologies.


@@ -249,7 +248,7 @@ config HISAX_NETJET
 
 config HISAX_NETJET_U
        bool "NETspider U card"
 
 config HISAX_NETJET_U
        bool "NETspider U card"

-       depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))
+       depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))

        help
          This enables HiSax support for the Netspider U interface ISDN card
          from Traverse Technologies.
        help
          This enables HiSax support for the Netspider U interface ISDN card
          from Traverse Technologies.


@@ -288,7 +287,7 @@ config HISAX_HSTSAPHIR
 
 config HISAX_BKM_A4T
        bool "Telekom A4T card"
 
 config HISAX_BKM_A4T
        bool "Telekom A4T card"

-       depends on PCI
+       depends on PCI && PCI_LEGACY

        help
          This enables HiSax support for the Telekom A4T card.
 
        help
          This enables HiSax support for the Telekom A4T card.
 


@@ -298,7 +297,7 @@ config HISAX_BKM_A4T
 
 config HISAX_SCT_QUADRO
        bool "Scitel Quadro card"
 
 config HISAX_SCT_QUADRO
        bool "Scitel Quadro card"

-       depends on PCI
+       depends on PCI && PCI_LEGACY

        help
          This enables HiSax support for the Scitel Quadro card.
 
        help
          This enables HiSax support for the Scitel Quadro card.
 


@@ -317,7 +316,7 @@ config HISAX_GAZEL
 
 config HISAX_HFC_PCI
        bool "HFC PCI-Bus cards"
 
 config HISAX_HFC_PCI
        bool "HFC PCI-Bus cards"

-       depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))
+       depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))

        help
          This enables HiSax support for the HFC-S PCI 2BDS0 based cards.
 
        help
          This enables HiSax support for the HFC-S PCI 2BDS0 based cards.
 


@@ -326,7 +325,7 @@ config HISAX_HFC_PCI
 
 config HISAX_W6692
        bool "Winbond W6692 based cards"
 
 config HISAX_W6692
        bool "Winbond W6692 based cards"

-       depends on PCI
+       depends on PCI && PCI_LEGACY

        help
          This enables HiSax support for Winbond W6692 based PCI ISDN cards.
 
        help
          This enables HiSax support for Winbond W6692 based PCI ISDN cards.
 


@@ -340,11 +339,9 @@ config HISAX_HFC_SX
          This enables HiSax support for the HFC-S+, HFC-SP and HFC-PCMCIA
          cards. This code is not finished yet.
 
          This enables HiSax support for the HFC-S+, HFC-SP and HFC-PCMCIA
          cards. This code is not finished yet.
 

-#      bool '  TESTEMULATOR (EXPERIMENTAL)' CONFIG_HISAX_TESTEMU
-

 config HISAX_ENTERNOW_PCI
        bool "Formula-n enter:now PCI card"
 config HISAX_ENTERNOW_PCI
        bool "Formula-n enter:now PCI card"

-       depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))
+       depends on HISAX_NETJET && PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))

        help
          This enables HiSax support for the Formula-n enter:now PCI
          ISDN card.
        help
          This enables HiSax support for the Formula-n enter:now PCI
          ISDN card.


@@ -414,7 +411,7 @@ config HISAX_HFC4S8S
 
 config HISAX_FRITZ_PCIPNP
        tristate "AVM Fritz!Card PCI/PCIv2/PnP support (EXPERIMENTAL)"
 
 config HISAX_FRITZ_PCIPNP
        tristate "AVM Fritz!Card PCI/PCIv2/PnP support (EXPERIMENTAL)"

-       depends on PCI && EXPERIMENTAL
+       depends on PCI && PCI_LEGACY && EXPERIMENTAL

        help
          This enables the driver for the AVM Fritz!Card PCI,
          Fritz!Card PCI v2 and Fritz!Card PnP.
        help
          This enables the driver for the AVM Fritz!Card PCI,
          Fritz!Card PCI v2 and Fritz!Card PnP.