From e51e3d76335a774f81483348c1ebebf5da912a7f Mon Sep 17 00:00:00 2001 From: acinonyx Date: Sun, 17 Jun 2012 20:49:55 +0000 Subject: [PATCH] [package] acx-mac80211: Bump to v20120607 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32416 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/acx-mac80211/Makefile | 4 ++-- .../acx-mac80211/patches/003-build_as_modules.patch | 13 ------------- .../patches/004-ratelimit_compile_fix.patch | 10 ++++------ 3 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 package/acx-mac80211/patches/003-build_as_modules.patch diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile index ef84bfffb..fc95a609a 100644 --- a/package/acx-mac80211/Makefile +++ b/package/acx-mac80211/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=acx-mac80211 -PKG_REV:=15bbffeadc1928a21a8a5f6519a5aea13b50678a -PKG_VERSION:=20120422 +PKG_REV:=v20120607 +PKG_VERSION:=20120607 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/package/acx-mac80211/patches/003-build_as_modules.patch b/package/acx-mac80211/patches/003-build_as_modules.patch deleted file mode 100644 index e0a3fd0e7..000000000 --- a/package/acx-mac80211/patches/003-build_as_modules.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: acx-mac80211-20120422/Makefile -=================================================================== ---- acx-mac80211-20120422.orig/Makefile 2012-04-23 17:35:13.000000000 +0200 -+++ acx-mac80211-20120422/Makefile 2012-04-23 17:36:55.386257951 +0200 -@@ -30,7 +30,7 @@ - acx-mac80211-obj-$(CONFIG_ACX_MAC80211_PCI) += pci.o - acx-mac80211-obj-$(CONFIG_ACX_MAC80211_USB) += usb.o - acx-mac80211-obj-$(CONFIG_ACX_MAC80211_MEM) += mem.o -- acx-mac80211-objs := common.o $(acx-mac80211-obj-y) merge.o -+ acx-mac80211-objs := common.o $(acx-mac80211-obj-m) merge.o - - else - # Otherwise we were called directly from the command line: the kernel build diff --git a/package/acx-mac80211/patches/004-ratelimit_compile_fix.patch b/package/acx-mac80211/patches/004-ratelimit_compile_fix.patch index a30e3dc7d..56110eab0 100644 --- a/package/acx-mac80211/patches/004-ratelimit_compile_fix.patch +++ b/package/acx-mac80211/patches/004-ratelimit_compile_fix.patch @@ -1,9 +1,7 @@ -Index: acx-mac80211-20120422/common.c -=================================================================== ---- acx-mac80211-20120422.orig/common.c 2012-04-23 17:35:13.000000000 +0200 -+++ acx-mac80211-20120422/common.c 2012-04-23 17:37:02.818257747 +0200 -@@ -33,6 +33,7 @@ - #include +--- a/common.c ++++ b/common.c +@@ -34,6 +34,7 @@ + #include #include #include +#include