zd1211rw: fix #define collision for register names triggered by compat patches
SVN-Revision: 25965
This commit is contained in:
parent
730dc33c75
commit
fb15c3737c
1 changed files with 14 additions and 0 deletions
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 a new issue