diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:02:04 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:02:04 -0400 |
| commit | b2382b363df828f25e35ed8b70a3da33b29b2a64 (patch) | |
| tree | 23aa2e70ba4650390c9281b3696172313bdb0f38 /drivers/net/wireless/Kconfig | |
| parent | 1b5cca3a88b7682d538d129c25f0e3092613a243 (diff) | |
| parent | 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf (diff) | |
Merge upstream into ieee80211.
Hand-fix merge conflict in drivers/usb/net/zd1201.c.
Diffstat (limited to 'drivers/net/wireless/Kconfig')
| -rw-r--r-- | drivers/net/wireless/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index d20e0da05a26..057405067226 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig | |||
| @@ -374,7 +374,7 @@ config PCMCIA_HERMES | |||
| 374 | 374 | ||
| 375 | config AIRO_CS | 375 | config AIRO_CS |
| 376 | tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards" | 376 | tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards" |
| 377 | depends on NET_RADIO && PCMCIA | 377 | depends on NET_RADIO && PCMCIA && (BROKEN || !M32R) |
| 378 | ---help--- | 378 | ---help--- |
| 379 | This is the standard Linux driver to support Cisco/Aironet PCMCIA | 379 | This is the standard Linux driver to support Cisco/Aironet PCMCIA |
| 380 | 802.11 wireless cards. This driver is the same as the Aironet | 380 | 802.11 wireless cards. This driver is the same as the Aironet |