diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index beac17a0fcabea7fd2ba4a1a50c65f123e6dd9f9..9e13763b609242e0c5429a364be461a7e8fc2594 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -109,7 +109,6 @@ obj-$(CONFIG_MICROCODE)			+= microcode.o
 obj-$(CONFIG_X86_CHECK_BIOS_CORRUPTION) += check.o
 
 obj-$(CONFIG_SWIOTLB)			+= pci-swiotlb.o
-obj-$(CONFIG_X86_32_IRIS)		+= iris.o
 
 ###
 # 64 bit specific files
diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile
index a019bc3088a05cdc32cef82d0c98374c74026746..021eee91c0562503dbb68c5bea490674d9db8618 100644
--- a/arch/x86/platform/Makefile
+++ b/arch/x86/platform/Makefile
@@ -1,6 +1,7 @@
 # Platform specific code goes here
 obj-y	+= ce4100/
 obj-y	+= efi/
+obj-y	+= iris/
 obj-y	+= mrst/
 obj-y	+= olpc/
 obj-y	+= scx200/
diff --git a/arch/x86/platform/iris/Makefile b/arch/x86/platform/iris/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..db921983a102f990e1557723df1e45abc441efc7
--- /dev/null
+++ b/arch/x86/platform/iris/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_X86_32_IRIS)		+= iris.o
diff --git a/arch/x86/kernel/iris.c b/arch/x86/platform/iris/iris.c
similarity index 100%
rename from arch/x86/kernel/iris.c
rename to arch/x86/platform/iris/iris.c