diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 -0400 |
| commit | 9b610fda0df5d0f0b0c64242e37441ad1b384aac (patch) | |
| tree | 0ea14b15f2e6546f37fe18d8ac3dc83077ec0e55 /include/asm-x86/elf.h | |
| parent | b8f8c3cf0a4ac0632ec3f0e15e9dc0c29de917af (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into timers/nohz
Diffstat (limited to 'include/asm-x86/elf.h')
| -rw-r--r-- | include/asm-x86/elf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86/elf.h b/include/asm-x86/elf.h index 8f232dc5b5fe..7be4733c793e 100644 --- a/include/asm-x86/elf.h +++ b/include/asm-x86/elf.h | |||
| @@ -83,9 +83,9 @@ extern unsigned int vdso_enabled; | |||
| 83 | (((x)->e_machine == EM_386) || ((x)->e_machine == EM_486)) | 83 | (((x)->e_machine == EM_386) || ((x)->e_machine == EM_486)) |
| 84 | 84 | ||
| 85 | #include <asm/processor.h> | 85 | #include <asm/processor.h> |
| 86 | #include <asm/system.h> | ||
| 86 | 87 | ||
| 87 | #ifdef CONFIG_X86_32 | 88 | #ifdef CONFIG_X86_32 |
| 88 | #include <asm/system.h> /* for savesegment */ | ||
| 89 | #include <asm/desc.h> | 89 | #include <asm/desc.h> |
| 90 | 90 | ||
| 91 | #define elf_check_arch(x) elf_check_arch_ia32(x) | 91 | #define elf_check_arch(x) elf_check_arch_ia32(x) |