dasharo/linux
0
0
Fork 0
mirror of https://github.com/Dasharo/linux.git synced 2026-03-06 15:25:10 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2008-05-04 17:11:43 -07:00
parent 10ea18f0de 62179849b4
commit 45ea2103d8
14 changed files with 34 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/asm-x86/bootparam.h
View File

@@ -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 {