aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Almesberger <werner@openmoko.org>2008-11-19 17:11:21 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-11-19 17:11:21 +0000
commiteecf89b3bccd69d69aaaa09f990d346ee66a2d5d (patch)
treea87ef4f3d03f97de976368d8736dba30e86c966b
parent5a3e16857d5da8a5db2e2c803129ccb43982cfc1 (diff)
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>
-rw-r--r--arch/arm/Kconfig2
-rw-r--r--drivers/Makefile1
-rw-r--r--drivers/ar6000/Kconfig7
-rw-r--r--drivers/ar6000/Makefile2
4 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0ebe540b46f..443a9d510c0 100644
--- 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 82ed733df45..0d432f02300 100644
--- 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
index 00000000000..67fb9643464
--- /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 4dc5109e3bd..7551dbf7ccf 100644
--- 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 \