diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 11:05:58 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 11:05:58 +0100 |
| commit | cd80a8142efa3468c2cd9fb52845f334c3220d54 (patch) | |
| tree | 919e88994bd3c09b34ce852d0a09bb0655d231d0 /arch/x86/kernel/trampoline_32.S | |
| parent | 641cd4cfcdc71ce01535b31cc4d57d59a1fae1fc (diff) | |
| parent | a98fe7f3425c6b4e90de16f8da63b0429a8fed08 (diff) | |
| download | linux-cd80a8142efa3468c2cd9fb52845f334c3220d54.tar.gz | |
Merge branch 'x86/core' into core/ipi
Diffstat (limited to 'arch/x86/kernel/trampoline_32.S')
| -rw-r--r-- | arch/x86/kernel/trampoline_32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/trampoline_32.S b/arch/x86/kernel/trampoline_32.S index d8ccc3c6552f..66d874e5404c 100644 --- a/arch/x86/kernel/trampoline_32.S +++ b/arch/x86/kernel/trampoline_32.S @@ -29,7 +29,7 @@ #include <linux/linkage.h> #include <asm/segment.h> -#include <asm/page.h> +#include <asm/page_types.h> /* We can free up trampoline after bootup if cpu hotplug is not supported. */ #ifndef CONFIG_HOTPLUG_CPU |