aboutsummaryrefslogtreecommitdiffstats
path: root/package/acx-mac80211/patches/003-build_as_modules.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-04-24 08:05:46 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-04-24 08:05:46 +0000
commitf5f6fa3b0bd6e7032ee75adf36652349b9a0da3b (patch)
tree7d158c72899310e671b8400784200b36d170a0dc /package/acx-mac80211/patches/003-build_as_modules.patch
parent5d3e17b3745c386b18f5fe1d2e9d32cb949dd4c7 (diff)
downloadupstream-f5f6fa3b0bd6e7032ee75adf36652349b9a0da3b.tar.gz
upstream-f5f6fa3b0bd6e7032ee75adf36652349b9a0da3b.tar.bz2
upstream-f5f6fa3b0bd6e7032ee75adf36652349b9a0da3b.zip
[package] acx-mac80211: update to 20122204
Upstream commit id: 15bbffea git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31455 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/acx-mac80211/patches/003-build_as_modules.patch')
-rw-r--r--package/acx-mac80211/patches/003-build_as_modules.patch14
1 files changed, 8 insertions, 6 deletions
diff --git a/package/acx-mac80211/patches/003-build_as_modules.patch b/package/acx-mac80211/patches/003-build_as_modules.patch
index 31a6aae6cf..e0a3fd0e72 100644
--- a/package/acx-mac80211/patches/003-build_as_modules.patch
+++ b/package/acx-mac80211/patches/003-build_as_modules.patch
@@ -1,11 +1,13 @@
---- a/Makefile
-+++ b/Makefile
-@@ -29,7 +29,7 @@ ifneq ($(KERNELRELEASE),)
+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)
-+ acx-mac80211-objs := common.o $(acx-mac80211-obj-m)
-
+- 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