Merge branch 'linus' into sfi-release
[linux-2.6.git] / arch / x86 / kernel / Makefile
index 4ba419b..d8e5d0c 100644 (file)
@@ -56,6 +56,7 @@ obj-$(CONFIG_INTEL_TXT)               += tboot.o
 obj-$(CONFIG_STACKTRACE)       += stacktrace.o
 obj-y                          += cpu/
 obj-y                          += acpi/
+obj-$(CONFIG_SFI)              += sfi.o
 obj-y                          += reboot.o
 obj-$(CONFIG_MCA)              += mca_32.o
 obj-$(CONFIG_X86_MSR)          += msr.o