[PATCH] libertas: split module into two (libertas.ko and usb8xxx.ko)

* add CONFIG_LIBERTAS to Kconfig
* remove global variable libertas_fw_name, the USB module might want to
    use a different default FW name than the CF module, so libertas_fw_name
    is now local to if_usb.c
* exported some symbols as GPL

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 12 insertions, 6 deletions

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index e3f5bb0fe603..89514f3e06c8 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -266,16 +266,22 @@ config IPW2200_DEBUG
 
           If you are not sure, say N here.
 
-config LIBERTAS_USB
-        tristate "Marvell Libertas 8388 802.11a/b/g cards"
-        depends on USB && WLAN_80211
+config LIBERTAS
+        tristate "Marvell 8xxx Libertas WLAN driver support"
+        depends on WLAN_80211
         select FW_LOADER
         ---help---
+          A library for Marvell Libertas 8xxx devices.
+
+config LIBERTAS_USB
+        tristate "Marvell Libertas 8388 USB 802.11b/g cards"
+        depends on LIBERTAS && USB
+        ---help---
           A driver for Marvell Libertas 8388 USB devices.
 
-config LIBERTAS_USB_DEBUG
-        bool "Enable full debugging output in the Libertas USB module."
-        depends on LIBERTAS_USB
+config LIBERTAS_DEBUG
+        bool "Enable full debugging output in the Libertas module."
+        depends on LIBERTAS
         ---help---
           Debugging support.