From: Al Viro Date: Tue, 23 Aug 2005 21:45:56 +0000 (+0100) Subject: [PATCH] Kconfig fix (airo_cs on m32r) X-Git-Tag: v2.6.13-rc7~38 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ab62c1e1dae0dedfc300c9f8e5c74227a8e26665;p=linux-2.6-omap-h63xx.git [PATCH] Kconfig fix (airo_cs on m32r) airo_cs is broken on m32r; marked as such. [Proper fix would involve separating PCI-dependent parts and making sure they don't get in the way _and_ arranging for asm/scatterlist.h getting picked on m32r] Signed-off-by: Al Viro Signed-off-by: Linus Torvalds --- diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 1d3231cc471..ec3f75a030d 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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