diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-23 19:23:46 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-23 19:23:46 -0400 |
| commit | 139d6065c83071d5f66cd013a274a43699f8e2c1 (patch) | |
| tree | b5f0e79e24449ff3284bc5f2f8d3aed041fda108 /drivers/net/wireless/wl12xx | |
| parent | efb064dec6e35618ddc04f3ba49f70e528fbe069 (diff) | |
| parent | b37fa870c7ccb500c7bf6aabc72cefa757da9791 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-rx.c
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 7b14d5bc63d6..88060e117541 100644 --- a/drivers/net/wireless/wl12xx/Kconfig +++ b/drivers/net/wireless/wl12xx/Kconfig | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | menuconfig WL12XX | 1 | menuconfig WL12XX |
| 2 | boolean "TI wl12xx driver support" | 2 | tristate "TI wl12xx driver support" |
| 3 | depends on MAC80211 && WLAN_80211 && EXPERIMENTAL | 3 | depends on MAC80211 && WLAN_80211 && EXPERIMENTAL |
| 4 | ---help--- | 4 | ---help--- |
| 5 | This will enable TI wl12xx driver support. The drivers make | 5 | This will enable TI wl12xx driver support. The drivers make |