mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-27 17:55:55 +02:00
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
This commit is contained in:
parent
da27ab47b3
commit
a78831d207
14
package/mac80211/patches/060-fix_zd1211_defines.patch
Normal file
14
package/mac80211/patches/060-fix_zd1211_defines.patch
Normal file
@ -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)
|
Loading…
Reference in New Issue
Block a user