diff options
author | 2010-06-15 17:31:06 +0200 | |
---|---|---|
committer | 2010-06-15 17:31:06 +0200 | |
commit | f9181f4ffc71d7b7dd1906c9a11d51d6659220ae (patch) | |
tree | 194f22e8216a1b9ee2c0dd019142202d73a7dc87 /drivers/net/wireless/at76c50x-usb.c | |
parent | netfilter: xtables: idletimer target implementation (diff) | |
parent | bnx2x: Fix link problem with some DACs (diff) | |
download | linux-dev-f9181f4ffc71d7b7dd1906c9a11d51d6659220ae.tar.xz linux-dev-f9181f4ffc71d7b7dd1906c9a11d51d6659220ae.zip |
Merge branch 'master' of /repos/git/net-next-2.6
Conflicts:
include/net/netfilter/xt_rateest.h
net/bridge/br_netfilter.c
net/netfilter/nf_conntrack_core.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'drivers/net/wireless/at76c50x-usb.c')
-rw-r--r-- | drivers/net/wireless/at76c50x-usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c index 8a2d4afc74f8..429b281d40d1 100644 --- a/drivers/net/wireless/at76c50x-usb.c +++ b/drivers/net/wireless/at76c50x-usb.c @@ -305,7 +305,7 @@ struct dfu_status { unsigned char poll_timeout[3]; unsigned char state; unsigned char string; -} __attribute__((packed)); +} __packed; static inline int at76_is_intersil(enum board_type board) { |