zd1211rw: fix #define collision for register names triggered by compat patches
[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 060-fix_zd1211_defines.patch
1 --- a/drivers/net/wireless/zd1211rw/zd_chip.h
2 +++ b/drivers/net/wireless/zd1211rw/zd_chip.h
3 @@ -60,6 +60,11 @@ enum {
4 #define E2P_DATA(offset) ((zd_addr_t)(E2P_START + E2P_DATA_OFFSET + (offset)))
5 #define FWRAW_DATA(offset) ((zd_addr_t)(FW_START + (offset)))
6
7 +#undef CR0
8 +#undef CR1
9 +#undef CR2
10 +#undef CR3
11 +
12 /* 8-bit hardware registers */
13 #define CR0 CTL_REG(0x0000)
14 #define CR1 CTL_REG(0x0004)