diff --git a/[refs] b/[refs] index 155b035eaf16..34efc9a0da90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 826c0e9e6ced6c1bb2d3f067ddff93d706b86446 +refs/heads/master: c94905c5c184686bffde7d0c23cadb64dfce17af diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile index 4d7a8e8dc44e..863f68d10d69 100644 --- a/trunk/arch/i386/kernel/Makefile +++ b/trunk/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/trunk/arch/i386/kernel/reboot.c b/trunk/arch/i386/kernel/reboot_32.c similarity index 100% rename from trunk/arch/i386/kernel/reboot.c rename to trunk/arch/i386/kernel/reboot_32.c