Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

[linux-2.6] / arch / x86 / kernel / Makefile_32

diff --git a/arch/x86/kernel/Makefile_32 b/arch/x86/kernel/Makefile_32
index cb25523026a6447d61f2312d110c9d063a07f337..c624193740fde274a00f59e123b7667cdda71111 100644 (file)
--- a/arch/x86/kernel/Makefile_32
+++ b/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