ath9k: merge a pending aggregation fix

[openwrt.git] / package / broadcom-diag / Makefile

diff --git a/package/broadcom-diag/Makefile b/package/broadcom-diag/Makefile
index 45bce0a..61b3529 100644 (file)
--- a/package/broadcom-diag/Makefile
+++ b/package/broadcom-diag/Makefile
@@ -1,24 +1,23 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=broadcom-diag
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=broadcom-diag

-PKG_RELEASE:=1
+PKG_RELEASE:=10

 
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/diag
   SUBMENU:=Other modules
 
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/diag
   SUBMENU:=Other modules

-  DEPENDS:=@TARGET_BRCM_2_4||TARGET_BRCM47XX
+  DEPENDS:=@TARGET_brcm47xx

   TITLE:=Driver for router LEDs and Buttons
   TITLE:=Driver for router LEDs and Buttons

-  FILES:=$(PKG_BUILD_DIR)/diag.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(PKG_BUILD_DIR)/diag.ko

 endef
 
 define Build/Prepare
 endef
 
 define Build/Prepare


@@ -26,10 +25,6 @@ define Build/Prepare
        $(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 
        $(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 

-ifeq ($(BOARD),brcm-2.4)
-       BUILDFLAGS=-DBCMDRIVER -I$(LINUX_DIR)/arch/mips/bcm947xx/include $(if $(CONFIG_LINUX_2_4),-DLINUX_2_4)
-endif
-

 define Build/Compile
        $(MAKE) -C "$(LINUX_DIR)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
 define Build/Compile
        $(MAKE) -C "$(LINUX_DIR)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \


@@ -38,5 +33,5 @@ define Build/Compile
                EXTRA_CFLAGS="$(BUILDFLAGS)" \
                modules
 endef
                EXTRA_CFLAGS="$(BUILDFLAGS)" \
                modules
 endef

-       
+

 $(eval $(call KernelPackage,diag))
 $(eval $(call KernelPackage,diag))