diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-18 14:48:30 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-18 14:48:30 -0700 |
| commit | 82d048186e403f36e083b37ad42aa90abb7dcaac (patch) | |
| tree | dc0b92ace036ef435318f38ef35b8c6e6b84103a /drivers/net/wireless/wl12xx | |
| parent | 62551d3ea05242d97d47f26fb517b2dfdb752310 (diff) | |
| parent | d3707d9918d47c0997a6b1e4ae24e7ab55e43796 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/wl12xx')
| -rw-r--r-- | drivers/net/wireless/wl12xx/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig index 20a9633569f..a82c4cd436d 100644 --- a/drivers/net/wireless/wl12xx/Kconfig +++ b/drivers/net/wireless/wl12xx/Kconfig @@ -1,6 +1,6 @@ config WL12XX tristate "TI wl1251/wl1271 support" - depends on MAC80211 && WLAN_80211 && SPI_MASTER && EXPERIMENTAL + depends on MAC80211 && WLAN_80211 && SPI_MASTER && GENERIC_HARDIRQS && EXPERIMENTAL select FW_LOADER select CRC7 ---help--- |