diff options
| author | Jarkko Sakkinen <jarkko.sakkinen@intel.com> | 2012-05-08 14:22:27 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-05-08 14:41:50 -0400 |
| commit | 5a8c9aebe04a78b069828d364798d5f24c5a42bd (patch) | |
| tree | 0c56b496e810fea8b97c31c9a72f49855983234e /arch/x86/kernel/Makefile | |
| parent | 084ee1c641a068bfd1194d545f7dc9ab2043eb35 (diff) | |
x86, realmode: Move reboot_32.S to unified realmode code
Migrated reboot_32.S from x86_trampoline to the real-mode
blob.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@intel.com>
Link: http://lkml.kernel.org/r/1336501366-28617-5-git-send-email-jarkko.sakkinen@intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/Makefile')
| -rw-r--r-- | arch/x86/kernel/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index f9e19d4eb984..b71ef35c7d77 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
| @@ -49,7 +49,6 @@ obj-$(CONFIG_STACKTRACE) += stacktrace.o | |||
| 49 | obj-y += cpu/ | 49 | obj-y += cpu/ |
| 50 | obj-y += acpi/ | 50 | obj-y += acpi/ |
| 51 | obj-y += reboot.o | 51 | obj-y += reboot.o |
| 52 | obj-$(CONFIG_X86_32) += reboot_32.o | ||
| 53 | obj-$(CONFIG_MCA) += mca_32.o | 52 | obj-$(CONFIG_MCA) += mca_32.o |
| 54 | obj-$(CONFIG_X86_MSR) += msr.o | 53 | obj-$(CONFIG_X86_MSR) += msr.o |
| 55 | obj-$(CONFIG_X86_CPUID) += cpuid.o | 54 | obj-$(CONFIG_X86_CPUID) += cpuid.o |