diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-05-05 22:14:16 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-05-05 22:14:16 +0200 |
commit | 83163244f845c296a118ce85c653872dbff6abfe (patch) | |
tree | ce2eac695a1c198f23d537e20ed86c16ece21f7e /drivers/net/wireless/Kconfig | |
parent | forcedeth: Kill NAPI config options. (diff) | |
parent | mac80211: use fixed channel in ibss join when appropriate (diff) | |
download | linux-83163244f845c296a118ce85c653872dbff6abfe.tar.xz linux-83163244f845c296a118ce85c653872dbff6abfe.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/libertas_tf/cmd.c
drivers/net/wireless/libertas_tf/main.c
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 77500cb7fd26..2fbe9b4506c0 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -38,6 +38,12 @@ config LIBERTAS_THINFIRM ---help--- A library for Marvell Libertas 8xxx devices using thinfirm. +config LIBERTAS_THINFIRM_DEBUG + bool "Enable full debugging output in the Libertas thin firmware module." + depends on LIBERTAS_THINFIRM + ---help--- + Debugging support. + config LIBERTAS_THINFIRM_USB tristate "Marvell Libertas 8388 USB 802.11b/g cards with thin firmware" depends on LIBERTAS_THINFIRM && USB |