mac80211: update to latest version from trunk
[openwrt-10.03/.git] / package / mac80211 / patches / 583-ath9k_remove_eep_reg_1.patch
1 --- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
2 +++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
3 @@ -415,8 +415,6 @@ static u32 ath9k_hw_def_get_eeprom(struc
4                 return get_unaligned_be16(pBase->macAddr + 4);
5         case EEP_REG_0:
6                 return pBase->regDmn[0];
7 -       case EEP_REG_1:
8 -               return pBase->regDmn[1];
9         case EEP_OP_CAP:
10                 return pBase->deviceCap;
11         case EEP_OP_MODE:
12 --- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c
13 +++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
14 @@ -322,8 +322,6 @@ static u32 ath9k_hw_4k_get_eeprom(struct
15                 return get_unaligned_be16(pBase->macAddr + 4);
16         case EEP_REG_0:
17                 return pBase->regDmn[0];
18 -       case EEP_REG_1:
19 -               return pBase->regDmn[1];
20         case EEP_OP_CAP:
21                 return pBase->deviceCap;
22         case EEP_OP_MODE:
23 --- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c
24 +++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
25 @@ -308,8 +308,6 @@ static u32 ath9k_hw_ar9287_get_eeprom(st
26                 return get_unaligned_be16(pBase->macAddr + 4);
27         case EEP_REG_0:
28                 return pBase->regDmn[0];
29 -       case EEP_REG_1:
30 -               return pBase->regDmn[1];
31         case EEP_OP_CAP:
32                 return pBase->deviceCap;
33         case EEP_OP_MODE:
34 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
35 +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
36 @@ -3014,8 +3014,6 @@ static u32 ath9k_hw_ar9300_get_eeprom(st
37                 return get_unaligned_be16(eep->macAddr + 4);
38         case EEP_REG_0:
39                 return le16_to_cpu(pBase->regDmn[0]);
40 -       case EEP_REG_1:
41 -               return le16_to_cpu(pBase->regDmn[1]);
42         case EEP_OP_CAP:
43                 return pBase->deviceCap;
44         case EEP_OP_MODE:
45 --- a/drivers/net/wireless/ath/ath9k/eeprom.h
46 +++ b/drivers/net/wireless/ath/ath9k/eeprom.h
47 @@ -225,7 +225,6 @@ enum eeprom_param {
48         EEP_MAC_MID,
49         EEP_MAC_LSW,
50         EEP_REG_0,
51 -       EEP_REG_1,
52         EEP_OP_CAP,
53         EEP_OP_MODE,
54         EEP_RF_SILENT,