aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-03-09 03:41:27 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-03-09 03:41:27 +0000
commitfb15c3737c20dd92c4b85774cb9e8ef3167c0c0f (patch)
treedb2a38912438e34d61fb6c5b33bb0f8c9be93d17
parent730dc33c753538bda0465fd1c5f3063e995bab5a (diff)
downloadupstream-fb15c3737c20dd92c4b85774cb9e8ef3167c0c0f.tar.gz
upstream-fb15c3737c20dd92c4b85774cb9e8ef3167c0c0f.tar.bz2
upstream-fb15c3737c20dd92c4b85774cb9e8ef3167c0c0f.zip
zd1211rw: fix #define collision for register names triggered by compat patches
SVN-Revision: 25965
-rw-r--r--package/mac80211/patches/060-fix_zd1211_defines.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/package/mac80211/patches/060-fix_zd1211_defines.patch b/package/mac80211/patches/060-fix_zd1211_defines.patch
new file mode 100644
index 0000000000..3b3e2d842e
--- /dev/null
+++ b/package/mac80211/patches/060-fix_zd1211_defines.patch
@@ -0,0 +1,14 @@
+--- a/drivers/net/wireless/zd1211rw/zd_chip.h
++++ b/drivers/net/wireless/zd1211rw/zd_chip.h
+@@ -60,6 +60,11 @@ enum {
+ #define E2P_DATA(offset) ((zd_addr_t)(E2P_START + E2P_DATA_OFFSET + (offset)))
+ #define FWRAW_DATA(offset) ((zd_addr_t)(FW_START + (offset)))
+
++#undef CR0
++#undef CR1
++#undef CR2
++#undef CR3
++
+ /* 8-bit hardware registers */
+ #define CR0 CTL_REG(0x0000)
+ #define CR1 CTL_REG(0x0004)