diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 06:05:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 06:05:58 -0400 |
| commit | cd80a8142efa3468c2cd9fb52845f334c3220d54 (patch) | |
| tree | 919e88994bd3c09b34ce852d0a09bb0655d231d0 /arch/x86/kernel/acpi/realmode/wakeup.S | |
| parent | 641cd4cfcdc71ce01535b31cc4d57d59a1fae1fc (diff) | |
| parent | a98fe7f3425c6b4e90de16f8da63b0429a8fed08 (diff) | |
Merge branch 'x86/core' into core/ipi
Diffstat (limited to 'arch/x86/kernel/acpi/realmode/wakeup.S')
| -rw-r--r-- | arch/x86/kernel/acpi/realmode/wakeup.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/acpi/realmode/wakeup.S b/arch/x86/kernel/acpi/realmode/wakeup.S index 3355973b12a..580b4e29601 100644 --- a/arch/x86/kernel/acpi/realmode/wakeup.S +++ b/arch/x86/kernel/acpi/realmode/wakeup.S | |||
| @@ -3,8 +3,8 @@ | |||
| 3 | */ | 3 | */ |
| 4 | #include <asm/segment.h> | 4 | #include <asm/segment.h> |
| 5 | #include <asm/msr-index.h> | 5 | #include <asm/msr-index.h> |
| 6 | #include <asm/page.h> | 6 | #include <asm/page_types.h> |
| 7 | #include <asm/pgtable.h> | 7 | #include <asm/pgtable_types.h> |
| 8 | #include <asm/processor-flags.h> | 8 | #include <asm/processor-flags.h> |
| 9 | 9 | ||
| 10 | .code16 | 10 | .code16 |