lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge upstream into ieee80211.

Browse Source 
Hand-fix merge conflict in drivers/usb/net/zd1201.c.
This commit is contained in:
Jeff Garzik
2005-08-24 01:02:04 -04:00
parent 1b5cca3a88 0572e3da3f
commit b2382b363d
246 changed files with 1729 additions and 1386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/Kconfig
View File

@@ -374,7 +374,7 @@ config PCMCIA_HERMES
config AIRO_CS
tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards"
depends on NET_RADIO && PCMCIA
depends on NET_RADIO && PCMCIA && (BROKEN || !M32R)
---help---
This is the standard Linux driver to support Cisco/Aironet PCMCIA
802.11 wireless cards. This driver is the same as the Aironet