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

Merge upstream into 'upstream' branch of netdev-2.6.git.

Browse Source 
Hand fix merge conflict in drivers/net/tokenring/Kconfig.
This commit is contained in:
Jeff Garzik
2005-08-24 01:03:34 -04:00
parent 8531c5ffbc 0572e3da3f
commit 75a95178da
125 changed files with 676 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/Kconfig
View File

@@ -270,7 +270,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