Pull thermal into release branch

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

diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig
index 34ab5f7dcabc1daa4087893bde2c58c568687afa..a3b945ac32565be264096637b88901e1f6bfc0fe 100644 (file)
--- a/drivers/isdn/hisax/Kconfig
+++ b/drivers/isdn/hisax/Kconfig
@@ -1,6 +1,5 @@
 
 menu "Passive cards"
-       depends on ISDN_I4L
 
 config ISDN_DRV_HISAX
        tristate "HiSax SiemensChipSet driver support"
@@ -340,8 +339,6 @@ config HISAX_HFC_SX
          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"
        depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))