diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-02-22 15:10:22 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-22 15:10:22 -0500 |
| commit | 5db5e44cdcdc5ee9cc821bd4d63445af0bb34bce (patch) | |
| tree | b5e5787a6d5c15e589d275c7434ebbf341257234 /drivers/net/wireless/wl12xx/Kconfig | |
| parent | db62983a1e4b2af9e79c97af768f0c8b80bd93f0 (diff) | |
| parent | 320d6c1b56de5f461c6062625b9664095f90ee95 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/wl12xx/Kconfig')
| -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 0e65bce457d6..692ebff38fc8 100644 --- a/drivers/net/wireless/wl12xx/Kconfig +++ b/drivers/net/wireless/wl12xx/Kconfig | |||
| @@ -54,7 +54,7 @@ config WL12XX_SDIO | |||
| 54 | 54 | ||
| 55 | config WL12XX_SDIO_TEST | 55 | config WL12XX_SDIO_TEST |
| 56 | tristate "TI wl12xx SDIO testing support" | 56 | tristate "TI wl12xx SDIO testing support" |
| 57 | depends on WL12XX && MMC | 57 | depends on WL12XX && MMC && WL12XX_SDIO |
| 58 | default n | 58 | default n |
| 59 | ---help--- | 59 | ---help--- |
| 60 | This module adds support for the SDIO bus testing with the | 60 | This module adds support for the SDIO bus testing with the |