Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / drivers / net / wireless / wl12xx / wl1271_ini.h

diff --git a/drivers/net/wireless/wl12xx/wl1271_ini.h b/drivers/net/wireless/wl12xx/wl1271_ini.h
index 0fb156a5af1289f89a7d4b6f6e4ea0370e5cc740..2313047d401524ad62b4b396f3462cafe94e1060 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271_ini.h
+++ b/drivers/net/wireless/wl12xx/wl1271_ini.h
@@ -39,7 +39,7 @@ struct wl1271_ini_general_params {
        u8 srf1[WL1271_INI_MAX_SMART_REFLEX_PARAM];
        u8 srf2[WL1271_INI_MAX_SMART_REFLEX_PARAM];
        u8 srf3[WL1271_INI_MAX_SMART_REFLEX_PARAM];
-} __attribute__ ((packed));
+} __packed;
 
 #define WL1271_INI_RSSI_PROCESS_COMPENS_SIZE 15
 
@@ -47,7 +47,7 @@ struct wl1271_ini_band_params_2 {
        u8 rx_trace_insertion_loss;
        u8 tx_trace_loss;
        u8 rx_rssi_process_compens[WL1271_INI_RSSI_PROCESS_COMPENS_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 #define WL1271_INI_RATE_GROUP_COUNT 6
 #define WL1271_INI_CHANNEL_COUNT_2 14
@@ -66,7 +66,7 @@ struct wl1271_ini_fem_params_2 {
        u8 rx_fem_insertion_loss;
        u8 degraded_low_to_normal_thr;
        u8 normal_to_degraded_high_thr;
-} __attribute__ ((packed));
+} __packed;
 
 #define WL1271_INI_CHANNEL_COUNT_5 35
 #define WL1271_INI_SUB_BAND_COUNT_5 7
@@ -75,7 +75,7 @@ struct wl1271_ini_band_params_5 {
        u8 rx_trace_insertion_loss[WL1271_INI_SUB_BAND_COUNT_5];
        u8 tx_trace_loss[WL1271_INI_SUB_BAND_COUNT_5];
        u8 rx_rssi_process_compens[WL1271_INI_RSSI_PROCESS_COMPENS_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1271_ini_fem_params_5 {
        __le16 tx_bip_ref_pd_voltage[WL1271_INI_SUB_BAND_COUNT_5];
@@ -90,7 +90,7 @@ struct wl1271_ini_fem_params_5 {
        u8 rx_fem_insertion_loss[WL1271_INI_SUB_BAND_COUNT_5];
        u8 degraded_low_to_normal_thr;
        u8 normal_to_degraded_high_thr;
-} __attribute__ ((packed));
+} __packed;
 
 
 /* NVS data structure */
@@ -118,6 +118,6 @@ struct wl1271_nvs_file {
                struct wl1271_ini_fem_params_5 params;
                u8 padding;
        } dyn_radio_params_5[WL1271_INI_FEM_MODULE_COUNT];
-} __attribute__ ((packed));
+} __packed;
 
 #endif