[PATCH 1/7] acxsm: Change Kconfig and Makefile to be modular

[Carlos Martin <carlos@cmartin.tk>]

We now only expose ACX_PCI and ACX_USB and the Makefile creates
acx-usb.ko, acx-pci.ko and acx-common.ko

Signed-off-by: Carlos Martin <carlos@cmartin.tk>

---

 Kconfig  |   40 ++++++++++++++++++++--------------------
 Makefile |   15 +++++++++++----
 2 files changed, 31 insertions(+), 24 deletions(-)

66c1585df6e0969806b9608fb3f006eb1eb02637
diff --git a/Kconfig b/Kconfig
index 8ec3879..ba7889e 100644
--- a/Kconfig
+++ b/Kconfig
@@ -1,6 +1,6 @@
-config ACX
-	tristate "TI acx100/acx111 802.11b/g wireless chipsets"
-	depends on NET_RADIO && EXPERIMENTAL && (USB || PCI)
+config ACX_PCI
+	tristate "TI acx100/acx111 802.11b/g PCI"
+	depends on NET_RADIO && EXPERIMENTAL && PCI
 	select FW_LOADER
 	select IEEE80211
 	select IEEE80211_SOFTMAC
@@ -8,20 +8,7 @@ config ACX
 	A driver for 802.11b/g wireless cards based on
 	Texas Instruments acx100 and acx111 chipsets.
 
-	This driver supports Host AP mode that allows
-	your computer to act as an IEEE 802.11 access point.
-	This driver is new and experimental.
-
-	Texas Instruments did not take part in development of this driver
-	in any way, shape or form.
-
-	The driver can be compiled as a module and will be named "acx".
-
-config ACX_PCI
-	bool "TI acx100/acx111 802.11b/g PCI"
-	depends on ACX && PCI
-	---help---
-	Include PCI and CardBus support in acx.
+	This is the PCI code.
 
 	acx chipsets need their firmware loaded at startup.
 	You will need to provide a firmware image via hotplug.
@@ -46,11 +33,20 @@ config ACX_PCI
 	Firmware files are not covered by GPL and are not distributed
 	with this driver for legal reasons.
 
+	Texas Instruments did not take part in development of this driver
+	in any way, shape or form.
+
 config ACX_USB
-	bool "TI acx100/acx111 802.11b/g USB"
-	depends on ACX && (USB=y || USB=ACX)
+	tristate "TI acx100/acx111 802.11b/g USB"
+	depends on NET_RADIO && EXPERIMENTAL && USB
+	select FW_LOADER
+	select IEEE80211
+	select IEEE80211_SOFTMAC
 	---help---
-	Include USB support in acx.
+	A driver for 802.11b/g wireless cards based on
+	Texas Instruments acx100 and acx111 chipsets.
+
+	This is the USB code.
 
 	There is only one currently known device in this category,
 	D-Link DWL-120+, but newer devices seem to be on the horizon.
@@ -63,3 +59,7 @@ config ACX_USB
 
 	Firmware files are not covered by GPL and are not distributed
 	with this driver for legal reasons.
+
+	Texas Instruments did not take part in development of this driver
+	in any way, shape or form.
+
diff --git a/Makefile b/Makefile
index 192e6d3..8aa56af 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,13 @@
-obj-$(CONFIG_ACX) += acx.o
+acx-common-y += wlan.o ioctl.o common.o
+acx-usb-y += usb.o
+acx-pci-y += pci.o
 
-acx-obj-$(CONFIG_ACX_PCI) += pci.o
-acx-obj-$(CONFIG_ACX_USB) += usb.o
+obj-$(CONFIG_ACX_PCI) += acx-common.o acx-pci.o
+obj-$(CONFIG_ACX_USB) += acx-common.o acx-usb.o
 
-acx-objs := wlan.o ioctl.o common.o $(acx-obj-y)
+#obj-$(CONFIG_ACX) += acx.o
+#
+#acx-obj-$(CONFIG_ACX_PCI) += pci.o
+#acx-obj-$(CONFIG_ACX_USB) += usb.o
+#
+#acx-objs := wlan.o ioctl.o common.o $(acx-obj-y)
-- 
1.2.1.g62a4




-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid\x110944&bid$1720&dat\x121642