diff options
| author | Luciano Coelho <coelho@ti.com> | 2013-01-18 09:40:07 +0200 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2013-01-18 09:59:08 +0200 |
| commit | 5b37649bbcfc14c1ecfb76c5b018dd686924b946 (patch) | |
| tree | 5d88b1619176b860041fdd20b64ce917b8613698 /drivers/net/wireless/ti/wl1251 | |
| parent | 660b9caaad380758c756a7e60397e33dab44fe3f (diff) | |
| parent | 2e07d02828759a506b5205b2cff40daa58df5bf7 (diff) | |
| download | op-kernel-dev-5b37649bbcfc14c1ecfb76c5b018dd686924b946.zip op-kernel-dev-5b37649bbcfc14c1ecfb76c5b018dd686924b946.tar.gz | |
Merge branch 'wl12xx-next' into for-linville
Conflicts:
drivers/net/wireless/ti/wl12xx/main.c
drivers/net/wireless/ti/wlcore/wlcore.h
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 1fb6584..8fec4ed 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--- |
