diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-04 17:03:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-04 17:03:56 -0700 |
| commit | c635fd3d3de9dec4729135add72c2ff32595605b (patch) | |
| tree | 9617681bd52cf63ae0797acc1ab13aefca2ed7d7 /include | |
| parent | 82e68f7ffec3800425f2391c8c86277606860442 (diff) | |
| parent | cf368d2f9aced8adc8bd6b1f04294a71551d5fce (diff) | |
Merge git://git.infradead.org/users/dwmw2/random-2.6
* git://git.infradead.org/users/dwmw2/random-2.6:
drivers/video/console/promcon.c: fix build error
Fix IHEX firmware generation/loading
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ihex.h | 2 | ||||
| -rw-r--r-- | include/linux/vt_kern.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/ihex.h b/include/linux/ihex.h index 2baace2788a..31d8629e75a 100644 --- a/include/linux/ihex.h +++ b/include/linux/ihex.h @@ -18,7 +18,7 @@ struct ihex_binrec { __be32 addr; __be16 len; uint8_t data[0]; -} __attribute__((aligned(4))); +} __attribute__((packed)); /* Find the next record, taking into account the 4-byte alignment */ static inline const struct ihex_binrec * diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h index 8c8119ffee1..1c78d56c57e 100644 --- a/include/linux/vt_kern.h +++ b/include/linux/vt_kern.h @@ -86,6 +86,7 @@ int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc); #define con_copy_unimap(d, s) (0) #define con_get_unimap(vc, ct, uct, list) (-EINVAL) #define con_free_unimap(vc) do { ; } while (0) +#define con_protect_unimap(vc, rdonly) do { ; } while (0) #define vc_translate(vc, c) (c) #endif |