diff options
| author | Luciano Coelho <coelho@ti.com> | 2012-04-12 16:32:53 +0400 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2012-04-12 16:32:53 +0400 |
| commit | 916ef361ce70a56601654e44c91855153e557051 (patch) | |
| tree | ea2812e64d17e2bf93a65e5a1933d54ff0e07255 /drivers/net/wireless/Kconfig | |
| parent | e66a8ddff72e85605f2212a0ebc666c7e9116641 (diff) | |
| parent | 6bac40a63aae9d0942496c9f350dbb7a6c88e3fa (diff) | |
| download | linux-916ef361ce70a56601654e44c91855153e557051.tar.xz | |
Merge branch 'wl12xx-next' into for-linville
Diffstat (limited to 'drivers/net/wireless/Kconfig')
| -rw-r--r-- | drivers/net/wireless/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index abd3b71cd4ab..5f58fa53238c 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -282,8 +282,7 @@ source "drivers/net/wireless/orinoco/Kconfig" source "drivers/net/wireless/p54/Kconfig" source "drivers/net/wireless/rt2x00/Kconfig" source "drivers/net/wireless/rtlwifi/Kconfig" -source "drivers/net/wireless/wl1251/Kconfig" -source "drivers/net/wireless/wl12xx/Kconfig" +source "drivers/net/wireless/ti/Kconfig" source "drivers/net/wireless/zd1211rw/Kconfig" source "drivers/net/wireless/mwifiex/Kconfig" |