diff options
author | NeilBrown <neilb@suse.de> | 2010-08-10 04:02:33 +0400 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2010-08-10 04:02:33 +0400 |
commit | fd8aa2c1811bf60ccb2d5de0579c6f62aec1772d (patch) | |
tree | 311567d03758afc3a93b4273fe172836e89bb01d /drivers/net/wireless/wl12xx/wl1271_rx.h | |
parent | 6e17b0276452912cb13445e5ea552b599984675f (diff) | |
parent | 2144381da478cc4aa3a29ee29b0c5e6ddaaced14 (diff) | |
download | linux-fd8aa2c1811bf60ccb2d5de0579c6f62aec1772d.tar.xz |
Merge git://git.infradead.org/users/dwmw2/libraid-2.6 into for-linus
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_rx.h')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_rx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_rx.h b/drivers/net/wireless/wl12xx/wl1271_rx.h index b89be4758e78..13a232333b13 100644 --- a/drivers/net/wireless/wl12xx/wl1271_rx.h +++ b/drivers/net/wireless/wl12xx/wl1271_rx.h @@ -113,7 +113,7 @@ struct wl1271_rx_descriptor { u8 process_id; u8 pad_len; u8 reserved; -} __attribute__ ((packed)); +} __packed; void wl1271_rx(struct wl1271 *wl, struct wl1271_fw_status *status); u8 wl1271_rate_to_idx(struct wl1271 *wl, int rate); |