diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 02:59:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 02:59:21 -0400 |
| commit | cf206bffbb7542df54043fad9898113172af99d8 (patch) | |
| tree | c7e7ca9a93443b888f98a0c07e74751a1aa3c947 /include/linux/ihex.h | |
| parent | c1955a3d4762e7a9bf84035eb3c4886a900f0d15 (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
Merge branch 'linus' into sched/clock
Diffstat (limited to 'include/linux/ihex.h')
| -rw-r--r-- | include/linux/ihex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ihex.h b/include/linux/ihex.h index 2baace2788a7..31d8629e75a1 100644 --- a/include/linux/ihex.h +++ b/include/linux/ihex.h | |||
| @@ -18,7 +18,7 @@ struct ihex_binrec { | |||
| 18 | __be32 addr; | 18 | __be32 addr; |
| 19 | __be16 len; | 19 | __be16 len; |
| 20 | uint8_t data[0]; | 20 | uint8_t data[0]; |
| 21 | } __attribute__((aligned(4))); | 21 | } __attribute__((packed)); |
| 22 | 22 | ||
| 23 | /* Find the next record, taking into account the 4-byte alignment */ | 23 | /* Find the next record, taking into account the 4-byte alignment */ |
| 24 | static inline const struct ihex_binrec * | 24 | static inline const struct ihex_binrec * |