diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-12 14:25:04 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-12 14:25:04 -0400 |
| commit | 0440507bbc44149e63bbfb9df730ba3820371904 (patch) | |
| tree | 7275e41aa1aa7e4d19d0503f1c15f07991c1a120 /drivers/net/wireless/ti/Kconfig | |
| parent | 8d242488ce4627dd7e6333caab56df11ea25e239 (diff) | |
| parent | 7f0d9f430dc99303558adc30a75eef10c43f7bec (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/ti/Kconfig')
| -rw-r--r-- | drivers/net/wireless/ti/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ti/Kconfig b/drivers/net/wireless/ti/Kconfig index 1a72932e2213..be800119d0a3 100644 --- a/drivers/net/wireless/ti/Kconfig +++ b/drivers/net/wireless/ti/Kconfig | |||
| @@ -8,6 +8,7 @@ menuconfig WL_TI | |||
| 8 | if WL_TI | 8 | if WL_TI |
| 9 | source "drivers/net/wireless/ti/wl1251/Kconfig" | 9 | source "drivers/net/wireless/ti/wl1251/Kconfig" |
| 10 | source "drivers/net/wireless/ti/wl12xx/Kconfig" | 10 | source "drivers/net/wireless/ti/wl12xx/Kconfig" |
| 11 | source "drivers/net/wireless/ti/wl18xx/Kconfig" | ||
| 11 | 12 | ||
| 12 | # keep last for automatic dependencies | 13 | # keep last for automatic dependencies |
| 13 | source "drivers/net/wireless/ti/wlcore/Kconfig" | 14 | source "drivers/net/wireless/ti/wlcore/Kconfig" |