Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig
index 6c7b8bf..6dfc941 100644 (file)
--- a/drivers/isdn/hisax/Kconfig
+++ b/drivers/isdn/hisax/Kconfig
@@ -110,7 +110,7 @@ config HISAX_16_3
 
 config HISAX_TELESPCI
        bool "Teles PCI"
 
 config HISAX_TELESPCI
        bool "Teles PCI"

-       depends on PCI && (BROKEN || !(SPARC64 || PPC))
+       depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || 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.


@@ -134,6 +134,7 @@ config HISAX_AVM_A1
 
 config HISAX_FRITZPCI
        bool "AVM PnP/PCI (Fritz!PnP/PCI)"
 
 config HISAX_FRITZPCI
        bool "AVM PnP/PCI (Fritz!PnP/PCI)"

+       depends on BROKEN || !PPC64

        help
          This enables HiSax support for the AVM "Fritz!PnP" and "Fritz!PCI".
          See <file:Documentation/isdn/README.HiSax> on how to configure it.
        help
          This enables HiSax support for the AVM "Fritz!PnP" and "Fritz!PCI".
          See <file:Documentation/isdn/README.HiSax> on how to configure it.


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

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

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


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

-       depends on PCI && (BROKEN || !(SPARC64 || PPC))
+       depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || 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.


@@ -316,7 +317,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 || !(SPARC64 || PPC))
+       depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || 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.
 


@@ -343,14 +344,14 @@ config HISAX_HFC_SX
 
 config HISAX_ENTERNOW_PCI
        bool "Formula-n enter:now PCI card"
 
 config HISAX_ENTERNOW_PCI
        bool "Formula-n enter:now PCI card"

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

        help
          This enables HiSax support for the Formula-n enter:now PCI
          ISDN card.
 
 config HISAX_AMD7930
        bool "Am7930 (EXPERIMENTAL)"
        help
          This enables HiSax support for the Formula-n enter:now PCI
          ISDN card.
 
 config HISAX_AMD7930
        bool "Am7930 (EXPERIMENTAL)"

-       depends on EXPERIMENTAL && (SPARC32 || SPARC64)
+       depends on EXPERIMENTAL && SPARC && BROKEN

        help
          This enables HiSax support for the AMD7930 chips on some SPARCs.
          This code is not finished yet.
        help
          This enables HiSax support for the AMD7930 chips on some SPARCs.
          This code is not finished yet.