diff --git a/[refs] b/[refs]
index 42e988f2ff9c..f177abda7e42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 250c22777fe1ccd7ac588579a6c16db4c0161cc5
+refs/heads/master: c668ce14f59db28a3551792763a0107caf3b9820
diff --git a/trunk/arch/x86/kernel/Makefile_32 b/trunk/arch/x86/kernel/Makefile_32
index cb25523026a6..c624193740fd 100644
--- a/trunk/arch/x86/kernel/Makefile_32
+++ b/trunk/arch/x86/kernel/Makefile_32
@@ -10,8 +10,8 @@ obj-y	:= process_32.o signal_32.o entry_32.o traps_32.o irq_32.o \
 		quirks.o i8237.o topology.o alternative.o i8253_32.o tsc_32.o
 
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
-obj-y				+= ../../x86/kernel/cpu/
-obj-y				+= ../../x86/kernel/acpi/
+obj-y				+= cpu/
+obj-y				+= acpi/
 obj-$(CONFIG_X86_BIOS_REBOOT)	+= reboot_32.o
 obj-$(CONFIG_MCA)		+= mca_32.o
 obj-$(CONFIG_X86_MSR)		+= msr.o