diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-05 15:26:41 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-05 15:26:41 -0500 |
| commit | 255333c1db3ec63921de29b134418a4e56e5921e (patch) | |
| tree | b1cd99373cabfa6fed020496d4d74500e7bc7e92 /drivers/net/wireless/p54common.h | |
| parent | 9a43b709a230705ca40a6f854a334a02334a3c1c (diff) | |
| parent | 0d66afe7805b169b6bf3c7a88cf8163298b8ef05 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/rc80211_pid_algo.c
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 dc9f4cef585e..c15b56e1d75e 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 | ||