ar6k-without-sdio.patch

Make the AR6000 WLAN driver compile after moving it outside the
Atheros SDIO stack. Note that the config option's name changes
as well.

The choice of a non-standard location (drivers/ar6000/) is
intentional. The driver is still very far from being in shape for
mainline inclusion, and the odd location should serve as an
immediate warning.

Not-Yet-Signed-off-by: Werner Almesberger <werner@openmoko.org>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0ebe540..443a9d5 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1269,7 +1269,7 @@ source "drivers/usb/Kconfig"
 
 source "drivers/uwb/Kconfig"
 
-source "drivers/sdio/Kconfig"
+source "drivers/ar6000/Kconfig"
 
 source "drivers/mmc/Kconfig"
 

diff --git a/drivers/Makefile b/drivers/Makefile
index 82ed733..0d432f0 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -87,6 +87,7 @@ obj-y                         += idle/
 obj-$(CONFIG_MMC)              += mmc/
 obj-$(CONFIG_MEMSTICK)         += memstick/
 obj-$(CONFIG_SDIO)              += sdio/
+obj-$(CONFIG_AR6000_WLAN)      += ar6000/
 obj-$(CONFIG_NEW_LEDS)         += leds/
 obj-$(CONFIG_INFINIBAND)       += infiniband/
 obj-$(CONFIG_SGI_SN)           += sn/

diff --git a/drivers/ar6000/Kconfig b/drivers/ar6000/Kconfig
new file mode 100644 (file)
index 0000000..67fb964
--- /dev/null
+++ b/drivers/ar6000/Kconfig
@@ -0,0 +1,7 @@
+config AR6000_WLAN
+        tristate "AR6000 wireless networking over SDIO"
+       depends on MMC
+        select WIRELESS_EXT
+        default m
+        help
+          good luck.

diff --git a/drivers/ar6000/Makefile b/drivers/ar6000/Makefile
index 4dc5109..7551dbf 100644 (file)
--- a/drivers/ar6000/Makefile
+++ b/drivers/ar6000/Makefile
@@ -13,7 +13,7 @@ EXTRA_CFLAGS += -DLINUX -D__KERNEL__ -DHTC_RAW_INTERFACE\
 
 EXTRA_CFLAGS += -DKERNEL_2_6
 
-obj-$(CONFIG_SDIO_AR6000_WLAN) += ar6000.o
+obj-$(CONFIG_AR6000_WLAN) += ar6000.o
 
 ar6000-objs += htc/ar6k.o                         \
               htc/ar6k_events.o           \