diff options
| author | Luciano Coelho <coelho@ti.com> | 2012-12-04 16:39:47 +0200 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2012-12-04 16:39:47 +0200 |
| commit | aaabee8b7686dfe49f10289cb4b7a817b99e5dd9 (patch) | |
| tree | 7ccc6cf829a93d46daf484164a5466c91eca2efa /drivers/net/wireless/ti/wl1251 | |
| parent | 795e9364215dc98b1dea888ebae22383ecbbb92a (diff) | |
| parent | 2f24456149110f4d9f0547429f1249d40143561d (diff) | |
Merge branch 'wl12xx-next' into for-linville
Conflicts:
drivers/net/wireless/ti/wlcore/main.c
Diffstat (limited to 'drivers/net/wireless/ti/wl1251')
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wl1251/Kconfig b/drivers/net/wireless/ti/wl1251/Kconfig index 1fb65849414..8fec4ed36ac 100644 --- a/drivers/net/wireless/ti/wl1251/Kconfig +++ b/drivers/net/wireless/ti/wl1251/Kconfig @@ -1,6 +1,6 @@ menuconfig WL1251 tristate "TI wl1251 driver support" - depends on MAC80211 && EXPERIMENTAL && GENERIC_HARDIRQS + depends on MAC80211 && GENERIC_HARDIRQS select FW_LOADER select CRC7 ---help--- |