summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/Kconfig
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-07-08 17:03:36 +0200
committerJohn W. Linville <linville@tuxdriver.com>2011-07-08 17:03:36 +0200
commit204d1641d200709c759d8c269458cbc7de378c40 (patch)
treece88690b4422078883f1651537ccd1f5d8ed7258 /drivers/net/wireless/wl12xx/Kconfig
parentpacket: Fix build with INET disabled. (diff)
parentrt2x00: Implement tx_frames_pending mac80211 callback function. (diff)
downloadlinux-204d1641d200709c759d8c269458cbc7de378c40.tar.xz
linux-204d1641d200709c759d8c269458cbc7de378c40.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/wl12xx/Kconfig')
-rw-r--r--drivers/net/wireless/wl12xx/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig
index 35ce7b0f4a60..07bcb1548d8b 100644
--- a/drivers/net/wireless/wl12xx/Kconfig
+++ b/drivers/net/wireless/wl12xx/Kconfig
@@ -11,7 +11,6 @@ config WL12XX
depends on WL12XX_MENU && GENERIC_HARDIRQS
depends on INET
select FW_LOADER
- select CRC7
---help---
This module adds support for wireless adapters based on TI wl1271 and
TI wl1273 chipsets. This module does *not* include support for wl1251.
@@ -33,6 +32,7 @@ config WL12XX_HT
config WL12XX_SPI
tristate "TI wl12xx SPI support"
depends on WL12XX && SPI_MASTER
+ select CRC7
---help---
This module adds support for the SPI interface of adapters using
TI wl12xx chipsets. Select this if your platform is using