diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 09:02:04 +0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 09:02:04 +0400 |
| commit | b2382b363df828f25e35ed8b70a3da33b29b2a64 (patch) | |
| tree | 23aa2e70ba4650390c9281b3696172313bdb0f38 /drivers/isdn/hisax/Kconfig | |
| parent | 1b5cca3a88b7682d538d129c25f0e3092613a243 (diff) | |
| parent | 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf (diff) | |
| download | linux-b2382b363df828f25e35ed8b70a3da33b29b2a64.tar.xz | |
Merge upstream into ieee80211.
Hand-fix merge conflict in drivers/usb/net/zd1201.c.
Diffstat (limited to 'drivers/isdn/hisax/Kconfig')
| -rw-r--r-- | drivers/isdn/hisax/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig index 6c7b8bffc6fd..801c98f30e5c 100644 --- a/drivers/isdn/hisax/Kconfig +++ b/drivers/isdn/hisax/Kconfig @@ -134,6 +134,7 @@ config HISAX_AVM_A1 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. |