diff --git a/[refs] b/[refs]
index 89f58f0c4397..ac4b05de5083 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4e72ad6bbbbbf1f826df3a5d3e3c4af2f4d48c9
+refs/heads/master: 3b3da9d25ae9d8cac99302ad66834499cf324d08
diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile
index 28c4f3f2e97d..f57eeea4bc16 100644
--- a/trunk/arch/x86/kernel/Makefile
+++ b/trunk/arch/x86/kernel/Makefile
@@ -101,9 +101,6 @@ obj-$(CONFIG_PARAVIRT_CLOCK)	+= pvclock.o
 
 obj-$(CONFIG_PCSPKR_PLATFORM)	+= pcspeaker.o
 
-obj-$(CONFIG_SCx200)		+= scx200.o
-scx200-y			+= scx200_32.o
-
 obj-$(CONFIG_OLPC)		+= olpc.o
 obj-$(CONFIG_OLPC_XO1)		+= olpc-xo1.o
 obj-$(CONFIG_OLPC_OPENFIRMWARE)	+= olpc_ofw.o
diff --git a/trunk/arch/x86/platform/Makefile b/trunk/arch/x86/platform/Makefile
index e629d7a428cb..1191989e9f00 100644
--- a/trunk/arch/x86/platform/Makefile
+++ b/trunk/arch/x86/platform/Makefile
@@ -1,4 +1,5 @@
 # Platform specific code goes here
 obj-y	+= efi/
+obj-y	+= scx200/
 obj-y	+= sfi/
 obj-y	+= visws/
diff --git a/trunk/arch/x86/platform/scx200/Makefile b/trunk/arch/x86/platform/scx200/Makefile
new file mode 100644
index 000000000000..762b4c7f4314
--- /dev/null
+++ b/trunk/arch/x86/platform/scx200/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_SCx200)		+= scx200.o
+scx200-y			+= scx200_32.o
diff --git a/trunk/arch/x86/kernel/scx200_32.c b/trunk/arch/x86/platform/scx200/scx200_32.c
similarity index 100%
rename from trunk/arch/x86/kernel/scx200_32.c
rename to trunk/arch/x86/platform/scx200/scx200_32.c