Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/net/wireless/p54/eeprom.h b/drivers/net/wireless/p54/eeprom.h
index 9051aef11249..afde72b84606 100644
--- a/drivers/net/wireless/p54/eeprom.h
+++ b/drivers/net/wireless/p54/eeprom.h
@@ -81,6 +81,12 @@ struct pda_pa_curve_data {
         u8 data[0];
 } __packed;
 
+struct pda_rssi_cal_ext_entry {
+        __le16 freq;
+        __le16 mul;
+        __le16 add;
+} __packed;
+
 struct pda_rssi_cal_entry {
         __le16 mul;
         __le16 add;
@@ -179,6 +185,7 @@ struct pda_custom_wrapper {
 
 /* used by our modificated eeprom image */
 #define PDR_RSSI_LINEAR_APPROXIMATION_CUSTOM            0xDEAD
+#define PDR_RSSI_LINEAR_APPROXIMATION_CUSTOMV2          0xCAFF
 #define PDR_PRISM_PA_CAL_OUTPUT_POWER_LIMITS_CUSTOM     0xBEEF
 #define PDR_PRISM_PA_CAL_CURVE_DATA_CUSTOM              0xB05D