diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-03-09 03:41:27 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-03-09 03:41:27 +0000 |
| commit | a78831d2071a96e0983e81e77cb5e4150e23a631 (patch) | |
| tree | 4c05f24adcf550873699d5480a6d9e7400fe13c2 /package | |
| parent | da27ab47b39f2ce943e83d0c15f936e7d0529663 (diff) | |
zd1211rw: fix #define collision for register names triggered by compat patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25965 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/mac80211/patches/060-fix_zd1211_defines.patch | 14 |
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 000000000..3b3e2d842 --- /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) |