diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
| commit | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (patch) | |
| tree | da3aa535c98cc0957851354ceb0fbff7482d7a9d /drivers/isdn/hisax/Kconfig | |
| parent | 1a1689344add3333d28d1b5495d8043a3877d01c (diff) | |
| parent | 4409d28140d9a6e6e3f4f1fdaf7234c4b965d954 (diff) | |
Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream
Diffstat (limited to 'drivers/isdn/hisax/Kconfig')
| -rw-r--r-- | drivers/isdn/hisax/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig index 34ab5f7dcabc..12d91fb9f8cb 100644 --- a/drivers/isdn/hisax/Kconfig +++ b/drivers/isdn/hisax/Kconfig | |||
| @@ -340,8 +340,6 @@ config HISAX_HFC_SX | |||
| 340 | This enables HiSax support for the HFC-S+, HFC-SP and HFC-PCMCIA | 340 | This enables HiSax support for the HFC-S+, HFC-SP and HFC-PCMCIA |
| 341 | cards. This code is not finished yet. | 341 | cards. This code is not finished yet. |
| 342 | 342 | ||
| 343 | # bool ' TESTEMULATOR (EXPERIMENTAL)' CONFIG_HISAX_TESTEMU | ||
| 344 | |||
| 345 | config HISAX_ENTERNOW_PCI | 343 | config HISAX_ENTERNOW_PCI |
| 346 | bool "Formula-n enter:now PCI card" | 344 | bool "Formula-n enter:now PCI card" |
| 347 | depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) | 345 | depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) |