diff options
author | David S. Miller <davem@davemloft.net> | 2008-03-04 19:44:01 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-04 19:44:01 -0500 |
commit | 3123e666ea92ab0b1762e97e0785d20a0ab25088 (patch) | |
tree | aab303bf0d7158edb438de6b47886f9b574d2541 /drivers/net/wireless/p54common.h | |
parent | ed58dd41f3aeefc11a7f634db90687f92ea8632e (diff) | |
parent | c256e05b7b30fab484deacb4f8cff59ce649c75e (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/p54common.h')
-rw-r--r-- | drivers/net/wireless/p54common.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/p54common.h b/drivers/net/wireless/p54common.h index a721334e20d9..b67ff34e26fe 100644 --- a/drivers/net/wireless/p54common.h +++ b/drivers/net/wireless/p54common.h | |||
@@ -53,10 +53,10 @@ struct pda_entry { | |||
53 | } __attribute__ ((packed)); | 53 | } __attribute__ ((packed)); |
54 | 54 | ||
55 | struct eeprom_pda_wrap { | 55 | struct eeprom_pda_wrap { |
56 | u32 magic; | 56 | __le32 magic; |
57 | u16 pad; | 57 | __le16 pad; |
58 | u16 len; | 58 | __le16 len; |
59 | u32 arm_opcode; | 59 | __le32 arm_opcode; |
60 | u8 data[0]; | 60 | u8 data[0]; |
61 | } __attribute__ ((packed)); | 61 | } __attribute__ ((packed)); |
62 | 62 | ||