diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-05 04:11:43 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-05 04:11:43 +0400 |
| commit | 45ea2103d8856454503b30464cc1dba378748d00 (patch) | |
| tree | f045cfc184e4103252d670145d18778220a5a3c1 /include/asm-x86 | |
| parent | 10ea18f0deb2372417c8e5be4d2ec79de1f65c4b (diff) | |
| parent | 62179849b40aded9e727cca5006627a1c4d6446e (diff) | |
| download | linux-45ea2103d8856454503b30464cc1dba378748d00.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
x86: fix setup printk format warning
x86: olpc build fix
x86: video/fbdev.c: add MODULE_LICENSE
x86: fix up bootparam.h for userspace inclusion
x86: relocs ELF handling - use SELFMAG instead of numeric constant
x86: vdso ELF handling - use SELFMAG instead of numeric constant
x86: remove dell reboot dmi quirk board name match
x86: es7000 build fix
x86: make additional_cpus static
x86: make start_secondary() static
kbuild, suspend, x86: fix rebuild of wakeup.bin
uml: fix gcc problem
x86: undo visws/numaq build changes
Diffstat (limited to 'include/asm-x86')
| -rw-r--r-- | include/asm-x86/bootparam.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-x86/bootparam.h b/include/asm-x86/bootparam.h index e8659909e5f6..f62f4733606b 100644 --- a/include/asm-x86/bootparam.h +++ b/include/asm-x86/bootparam.h @@ -14,10 +14,10 @@ /* extensible setup data list node */ struct setup_data { - u64 next; - u32 type; - u32 len; - u8 data[0]; + __u64 next; + __u32 type; + __u32 len; + __u8 data[0]; }; struct setup_header { |