Staging: Merge staging-next into Linus's tree

[sfrench/cifs-2.6.git] / drivers / net / wireless / wl12xx / wl1251_event.h

diff --git a/drivers/net/wireless/wl12xx/wl1251_event.h b/drivers/net/wireless/wl12xx/wl1251_event.h
index be0ac54d62468a9931a45a9179ccff94bdbe3a94..f48a2b66bc5a670b673b45d19a35c5b77b14de9b 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1251_event.h
+++ b/drivers/net/wireless/wl12xx/wl1251_event.h
@@ -82,7 +82,7 @@ struct event_debug_report {
        u32 report_1;
        u32 report_2;
        u32 report_3;
-} __attribute__ ((packed));
+} __packed;
 
 struct event_mailbox {
        u32 events_vector;
@@ -112,7 +112,7 @@ struct event_mailbox {
        struct event_debug_report report;
        u8 average_snr_level;
        u8 padding[19];
-} __attribute__ ((packed));
+} __packed;
 
 int wl1251_event_unmask(struct wl1251 *wl);
 void wl1251_event_mbox_config(struct wl1251 *wl);