aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:12:57 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:12:57 +0200
commitc94905c5c184686bffde7d0c23cadb64dfce17af (patch)
tree2909f465b97564705e571c91546f053906bb1eaa /arch/i386/kernel
parenti386: prepare shared kernel/trampoline.S (diff)
downloadlinux-dev-c94905c5c184686bffde7d0c23cadb64dfce17af.tar.xz
linux-dev-c94905c5c184686bffde7d0c23cadb64dfce17af.zip
i386: prepare shared kernel/reboot.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/i386/kernel')
-rw-r--r--arch/i386/kernel/Makefile2
-rw-r--r--arch/i386/kernel/reboot_32.c (renamed from arch/i386/kernel/reboot.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index 4d7a8e8dc44e..863f68d10d69 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -12,7 +12,7 @@ obj-y := process.o signal_32.o entry.o traps_32.o irq_32.o \
obj-$(CONFIG_STACKTRACE) += stacktrace.o
obj-y += cpu/
obj-y += acpi/
-obj-$(CONFIG_X86_BIOS_REBOOT) += reboot.o
+obj-$(CONFIG_X86_BIOS_REBOOT) += reboot_32.o
obj-$(CONFIG_MCA) += mca_32.o
obj-$(CONFIG_X86_MSR) += msr.o
obj-$(CONFIG_X86_CPUID) += cpuid.o
diff --git a/arch/i386/kernel/reboot.c b/arch/i386/kernel/reboot_32.c
index 0d796248866c..0d796248866c 100644
--- a/arch/i386/kernel/reboot.c
+++ b/arch/i386/kernel/reboot_32.c