From: Vasilis Tsiligiannis <acinonyx@openwrt.gr>
Date: Sun, 17 Jun 2012 20:49:55 +0000 (+0000)
Subject: acx-mac80211: Bump to v20120607
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=37c2235af71b49ece02a08d1fcdf3d0957a1dbb8;p=openwrt%2Fstaging%2Frobimarko.git

acx-mac80211: Bump to v20120607

SVN-Revision: 32416
---

diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile
index ef84bfffb5..fc95a609a8 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 e0a3fd0e72..0000000000
--- 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 a30e3dc7dc..56110eab0c 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 <linux/ethtool.h>
+--- a/common.c
++++ b/common.c
+@@ -34,6 +34,7 @@
+ #include <linux/pci.h>
  #include <linux/nl80211.h>
  #include <linux/ieee80211.h>
 +#include <linux/ratelimit.h>