X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fmac80211%2FMakefile;h=c59aaa508b840ced29f71bd117b1b14c475a338c;hb=720cdf88eb17e070b4acd4415f581c104cdd686e;hp=e44e6870f4e25d6c12f76b829808a31be2c5ea81;hpb=3912d46a72c934a0801c0baf8d7483434d4684f5;p=openwrt-10.03%2F.git

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index e44e6870f..c59aaa508 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -21,17 +21,19 @@ endif
 
 define KernelPackage/mac80211
   SUBMENU:=Wireless Drivers
-  TITLE:=DeviceScape 802.11 Wireless Networking Stack
-  DEPENDS:=@LINUX_2_6 +kmod-ieee80211
+  TITLE:=Linux 802.11 Wireless Networking Stack
+  DEPENDS:=@LINUX_2_6
   DESCRIPTION:=\
 	This package contains the DeviceScape 80211 wireless stack.
   VERSION:=$(PKG_RELEASE)+$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)
-  FILES:= \
+  ifneq ($(KERNEL_PATCHVER),2.6.21)
+   FILES:= \
 	$(PKG_BUILD_DIR)/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
 	$(PKG_BUILD_DIR)/mac80211/rc80211_lowest.$(LINUX_KMOD_SUFFIX) \
 	$(PKG_BUILD_DIR)/mac80211/rc80211_simple.$(LINUX_KMOD_SUFFIX) \
 	$(PKG_BUILD_DIR)/wireless/cfg80211.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,20,cfg80211 mac80211 rc80211_lowest rc80211_simple)
+   AUTOLOAD:=$(call AutoLoad,20,cfg80211 mac80211 rc80211_simple)
+  endif
 endef
 
 define Build/Prepare
@@ -44,24 +46,15 @@ endef
 MAKE_OPTS:=-C "$(LINUX_DIR)" \
 	CROSS_COMPILE="$(TARGET_CROSS)" \
 	ARCH="$(LINUX_KARCH)" \
-	EXTRA_CFLAGS="$(BUILDFLAGS) -DCONFIG_MAC80211_LEDS" \
+	EXTRA_CFLAGS="$(BUILDFLAGS) -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS" \
 	CONFIG_MAC80211=m \
-	CONFIG_MAC80211_LEDS=y
+	CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS)
 
-define Build/Compile
+ifneq ($(KERNEL_PATCHVER),2.6.21)
+  define Build/Compile
 	$(MAKE) $(MAKE_OPTS) SUBDIRS="$(PKG_BUILD_DIR)/wireless" modules
 	$(MAKE) $(MAKE_OPTS) SUBDIRS="$(PKG_BUILD_DIR)/mac80211" modules
-endef
-
-#define Build/InstallDev
-#	mkdir -p $(STAGING_DIR)/usr/include/madwifi
-#	$(CP) $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr/include/madwifi/
-#	mkdir -p $(STAGING_DIR)/usr/include/madwifi/net80211
-#	$(CP) $(PKG_BUILD_DIR)/net80211/*.h $(STAGING_DIR)/usr/include/madwifi/net80211/
-#endef
-
-#define Build/UninstallDev
-#	rm -rf	$(STAGING_DIR)/usr/include/madwifi
-#endef
+  endef
+endif
 
 $(eval $(call KernelPackage,mac80211))