libertas: separate libertas' Kconfig in it's own file

Also sorts all "source" lines in the wireless/Kconfig.

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

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index c9829c59fd985c06e3f19647f98f929cb5ebf976..18255fb28d179cf9323fe2ac987e5bc8bbc7ef82 100644 (file)
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -139,47 +139,6 @@ config PCMCIA_RAYCS
          To compile this driver as a module, choose M here: the module will be
          called ray_cs.  If unsure, say N.
 
-config LIBERTAS
-       tristate "Marvell 8xxx Libertas WLAN driver support"
-       depends on WLAN_80211
-       select WIRELESS_EXT
-       select WEXT_SPY
-       select LIB80211
-       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_CS
-       tristate "Marvell Libertas 8385 CompactFlash 802.11b/g cards"
-       depends on LIBERTAS && PCMCIA
-       select FW_LOADER
-       ---help---
-         A driver for Marvell Libertas 8385 CompactFlash devices.
-
-config LIBERTAS_SDIO
-       tristate "Marvell Libertas 8385/8686/8688 SDIO 802.11b/g cards"
-       depends on LIBERTAS && MMC
-       ---help---
-         A driver for Marvell Libertas 8385/8686/8688 SDIO devices.
-
-config LIBERTAS_SPI
-       tristate "Marvell Libertas 8686 SPI 802.11b/g cards"
-       depends on LIBERTAS && SPI
-       ---help---
-         A driver for Marvell Libertas 8686 SPI devices.
-
-config LIBERTAS_DEBUG
-       bool "Enable full debugging output in the Libertas module."
-       depends on LIBERTAS
-       ---help---
-         Debugging support.
-
 config LIBERTAS_THINFIRM
        tristate "Marvell 8xxx Libertas WLAN driver support with thin firmware"
        depends on WLAN_80211 && MAC80211
@@ -491,17 +450,18 @@ config MWL8K
          To compile this driver as a module, choose M here: the module
          will be called mwl8k.  If unsure, say N.
 
-source "drivers/net/wireless/p54/Kconfig"
 source "drivers/net/wireless/ath/Kconfig"
-source "drivers/net/wireless/ipw2x00/Kconfig"
-source "drivers/net/wireless/iwlwifi/Kconfig"
-source "drivers/net/wireless/hostap/Kconfig"
 source "drivers/net/wireless/b43/Kconfig"
 source "drivers/net/wireless/b43legacy/Kconfig"
-source "drivers/net/wireless/zd1211rw/Kconfig"
-source "drivers/net/wireless/rt2x00/Kconfig"
+source "drivers/net/wireless/hostap/Kconfig"
+source "drivers/net/wireless/ipw2x00/Kconfig"
+source "drivers/net/wireless/iwlwifi/Kconfig"
+source "drivers/net/wireless/iwmc3200wifi/Kconfig"
+source "drivers/net/wireless/libertas/Kconfig"
 source "drivers/net/wireless/orinoco/Kconfig"
+source "drivers/net/wireless/p54/Kconfig"
+source "drivers/net/wireless/rt2x00/Kconfig"
 source "drivers/net/wireless/wl12xx/Kconfig"
-source "drivers/net/wireless/iwmc3200wifi/Kconfig"
+source "drivers/net/wireless/zd1211rw/Kconfig"
 
 endif # WLAN

diff --git a/drivers/net/wireless/libertas/Kconfig b/drivers/net/wireless/libertas/Kconfig
new file mode 100644 (file)
index 0000000..3e6c922
--- /dev/null
+++ b/drivers/net/wireless/libertas/Kconfig
@@ -0,0 +1,40 @@
+config LIBERTAS
+       tristate "Marvell 8xxx Libertas WLAN driver support"
+       depends on WLAN_80211
+       select WIRELESS_EXT
+       select WEXT_SPY
+       select LIB80211
+       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_CS
+       tristate "Marvell Libertas 8385 CompactFlash 802.11b/g cards"
+       depends on LIBERTAS && PCMCIA
+       select FW_LOADER
+       ---help---
+         A driver for Marvell Libertas 8385 CompactFlash devices.
+
+config LIBERTAS_SDIO
+       tristate "Marvell Libertas 8385/8686/8688 SDIO 802.11b/g cards"
+       depends on LIBERTAS && MMC
+       ---help---
+         A driver for Marvell Libertas 8385/8686/8688 SDIO devices.
+
+config LIBERTAS_SPI
+       tristate "Marvell Libertas 8686 SPI 802.11b/g cards"
+       depends on LIBERTAS && SPI
+       ---help---
+         A driver for Marvell Libertas 8686 SPI devices.
+
+config LIBERTAS_DEBUG
+       bool "Enable full debugging output in the Libertas module."
+       depends on LIBERTAS
+       ---help---
+         Debugging support.

diff --git a/drivers/net/wireless/libertas/Makefile b/drivers/net/wireless/libertas/Makefile
index 0b6918584503b836d2cc49196f09e81725f31977..2f63940fb7f6742d6a9a9c9c7a4e3bd54e174748 100644 (file)
--- a/drivers/net/wireless/libertas/Makefile
+++ b/drivers/net/wireless/libertas/Makefile
@@ -1,5 +1,15 @@
-libertas-objs := main.o wext.o rx.o tx.o cmd.o cmdresp.o scan.o 11d.o  \
-                debugfs.o persistcfg.o ethtool.o assoc.o
+libertas-y += 11d.o
+libertas-y += assoc.o
+libertas-y += cmd.o
+libertas-y += cmdresp.o
+libertas-y += debugfs.o
+libertas-y += ethtool.o
+libertas-y += main.o
+libertas-y += persistcfg.o
+libertas-y += rx.o
+libertas-y += scan.o
+libertas-y += tx.o
+libertas-y += wext.o
 
 usb8xxx-objs += if_usb.o
 libertas_cs-objs += if_cs.o