diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-14 06:19:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-14 06:19:59 -0400 |
| commit | 8d7ccaa545490cdffdfaff0842436a8dd85cf47b (patch) | |
| tree | 8129b5907161bc6ae26deb3645ce1e280c5e1f51 /include/linux/ihex.h | |
| parent | b2139aa0eec330c711c5a279db361e5ef1178e78 (diff) | |
| parent | 30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff) | |
Merge commit 'v2.6.27-rc3' into x86/prototypes
Conflicts:
include/asm-x86/dma-mapping.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 * |