diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 14:12:44 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 14:12:44 -0700 |
commit | c2f73fd07d2ce4605b404f34395eb734a7ba9967 (patch) | |
tree | 4428204f4be7c7dfa55d674647c358ebc452063d /drivers/net/wireless/Kconfig | |
parent | d20ead9e86881bc7ae84e385f47b5196b7d93aac (diff) | |
parent | 727c26ed78b8f2b07452cf8bc9a07ff3f302ab48 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
net: libertas sdio driver
mmc: at91_mci: cleanup: use MCI_ERRORS
mmc: possible leak in mmc_read_ext_csd
Diffstat (limited to 'drivers/net/wireless/Kconfig')
-rw-r--r-- | drivers/net/wireless/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 5a6fdfd0f14..dae5c8d5a31 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -282,6 +282,12 @@ config LIBERTAS_CS ---help--- A driver for Marvell Libertas 8385 CompactFlash devices. +config LIBERTAS_SDIO + tristate "Marvell Libertas 8385 and 8686 SDIO 802.11b/g cards" + depends on LIBERTAS && MMC + ---help--- + A driver for Marvell Libertas 8385 and 8686 SDIO devices. + config LIBERTAS_DEBUG bool "Enable full debugging output in the Libertas module." depends on LIBERTAS |