diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-04-28 04:46:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-30 17:15:34 -0400 |
| commit | 3e8f7e35f3fd17eadef44e4679abb39a3806cf01 (patch) | |
| tree | 8e8ea55506a28163d6b983ee0dd8bf43bcbf37c5 /arch/x86/kernel | |
| parent | ed5e233284bc4aff965df7351da8426aa188c8f9 (diff) | |
x86 VISWS: build fix
the 'reboot_force' flag is a notion that non-PC subarchitectures do
not have.
also, unify the X86_BIOS_REBOOT option between 32-bit and 64-bit
and get rid of a few unnecessary Kconfig and Makefile complications
that way.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel')
| -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 30d54ed27e55..bbdacb398d48 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
| @@ -40,7 +40,6 @@ obj-$(CONFIG_STACKTRACE) += stacktrace.o | |||
| 40 | obj-y += cpu/ | 40 | obj-y += cpu/ |
| 41 | obj-y += acpi/ | 41 | obj-y += acpi/ |
| 42 | obj-$(CONFIG_X86_BIOS_REBOOT) += reboot.o | 42 | obj-$(CONFIG_X86_BIOS_REBOOT) += reboot.o |
| 43 | obj-$(CONFIG_X86_64) += reboot.o | ||
| 44 | obj-$(CONFIG_MCA) += mca_32.o | 43 | obj-$(CONFIG_MCA) += mca_32.o |
| 45 | obj-$(CONFIG_X86_MSR) += msr.o | 44 | obj-$(CONFIG_X86_MSR) += msr.o |
| 46 | obj-$(CONFIG_X86_CPUID) += cpuid.o | 45 | obj-$(CONFIG_X86_CPUID) += cpuid.o |