x86: platform: Move iris to x86/platform where it belongs

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
git-mirror · Nov 20, 2010 · 9cdca86 · 9cdca86
1 parent 5ca9afd
commit 9cdca86
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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
@@ -0,0 +1 @@
+obj-$(CONFIG_X86_32_IRIS)		+= iris.o
diff --git a/arch/x86/kernel/iris.c → arch/x86/platform/iris/iris.c b/arch/x86/kernel/iris.c → arch/x86/platform/iris/iris.c