From 04edd2b07e6b30866031d07fdfe3d0b9aae3898f Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Sat, 12 Jul 2008 15:04:36 +0000
Subject: [PATCH] fixes zd1211rw compile and cleans up mac80211 Makefile

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11787 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/kernel/modules/wireless.mk | 15 ------------
 package/mac80211/Makefile          | 38 +++++++-----------------------
 2 files changed, 8 insertions(+), 45 deletions(-)

diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index e8e9b8820d..f83bb723c6 100644
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -198,18 +198,3 @@ endef
 
 $(eval $(call KernelPackage,net-prism54))
 
-
-define KernelPackage/net-zd1211rw
-  SUBMENU:=$(WIRELESS_MENU)
-  TITLE:=Zydas ZD1211 support
-  DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-ieee80211-softmac
-  KCONFIG:=CONFIG_ZD1211RW
-  FILES:=$(LINUX_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,60,zd1211rw)
-endef
-
-define KernelPackage/net-zd1211rw/description
- Kernel modules for Zydas ZD1211 support, kernel version
-endef
-
-$(eval $(call KernelPackage,net-zd1211rw))
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 8da0c1d38f..2280aa6065 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -122,35 +122,13 @@ define KernelPackage/rt73-usb
   AUTOLOAD:=$(call AutoLoad,27,rt73usb)
 endef
 
-RT2X00_CONFOPTS:=CONFIG_RT2X00=y \
-		CONFIG_RT2X00_DEBUG=y \
-		CONFIG_RT2X00_LIB_FIRMWARE=y \
-		CONFIG_RT2X00_LIB_LEDS=y
-
-ifneq ($(CONFIG_PACKAGE_kmod-rt2x00-pci),)
-  RT2X00_CONFOPTS+= CONFIG_RT2X00_LIB_PCI=y
-endif
-ifneq ($(CONFIG_PACKAGE_kmod-rt2x00-usb),)
-  RT2X00_CONFOPTS+= CONFIG_RT2X00_LIB_USB=y
-endif
-ifneq ($(CONFIG_PACKAGE_kmod-rt2400-pci),)
-  RT2X00_CONFOPTS+= CONFIG_RT2400PCI=y
-endif
-ifneq ($(CONFIG_PACKAGE_kmod-rt2500-pci),)
-  RT2X00_CONFOPTS+= CONFIG_RT2500PCI=y
-endif
-ifneq ($(CONFIG_PACKAGE_kmod-rt2500-usb),)
-  RT2X00_CONFOPTS+= CONFIG_RT2500USB=y
-endif
-ifneq ($(CONFIG_PACKAGE_kmod-rt61-pci),)
-  RT2X00_CONFOPTS+= CONFIG_RT61PCI=y
-endif
-ifneq ($(CONFIG_PACKAGE_kmod-rt73-usb),)
-  RT2X00_CONFOPTS+= CONFIG_RT73USB=y
-endif
-
-
-CONFOPTS:=MAC80211 CFG80211 NL80211 MAC80211_RC_DEFAULT_PID MAC80211_RC_PID \
+define KernelPackage/net-zd1211rw
+  SUBMENU:=Wireless Drivers
+  TITLE:=Zydas ZD1211 support
+  DEPENDS:=@LINUX_2_6_24||LINUX_2_6_25 @USB_SUPPORT +kmod-ieee80211-softmac
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,60,zd1211rw)
+endef
 
 BUILDFLAGS:= \
 	$(foreach opt,$(CONFOPTS),-DCONFIG_$(opt)) \
@@ -209,7 +187,7 @@ define KernelPackage/rt73-usb/install
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/rt73.bin $(1)/lib/firmware/
 endef
 
-
+$(eval $(call KernelPackage,net-zd1211rw))
 $(eval $(call KernelPackage,mac80211))
 $(eval $(call KernelPackage,rt2x00-lib))
 $(eval $(call KernelPackage,rt2x00-pci))