diff --git a/[refs] b/[refs]
index 520442763078..dbf26912d83f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3adbb7f4a32dd34993ebe3829c69694f0c5fc85b
+refs/heads/master: 937f961a6539b0ac5ebf31472b90810bc1f02200
diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile
index 2c833d8c4141..d9067d10c6af 100644
--- a/trunk/arch/x86/kernel/Makefile
+++ b/trunk/arch/x86/kernel/Makefile
@@ -58,7 +58,6 @@ 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
diff --git a/trunk/arch/x86/platform/Makefile b/trunk/arch/x86/platform/Makefile
index fdf4113befba..a964fa3c0868 100644
--- a/trunk/arch/x86/platform/Makefile
+++ b/trunk/arch/x86/platform/Makefile
@@ -1 +1,2 @@
 # Platform specific code goes here
+obj-y	+= sfi/
diff --git a/trunk/arch/x86/platform/sfi/Makefile b/trunk/arch/x86/platform/sfi/Makefile
new file mode 100644
index 000000000000..cc5db1168a5e
--- /dev/null
+++ b/trunk/arch/x86/platform/sfi/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_SFI)		+= sfi.o
diff --git a/trunk/arch/x86/kernel/sfi.c b/trunk/arch/x86/platform/sfi/sfi.c
similarity index 100%
rename from trunk/arch/x86/kernel/sfi.c
rename to trunk/arch/x86/platform/sfi/sfi.c