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

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

x86: platform: Move iris to x86/platform where it belongs
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
9cdca869 · Thomas Gleixner · 5ca9afdb · 9cdca869 · 9cdca869 · 9cdca869
Commit 9cdca869 authored Nov 20, 2010 by Thomas Gleixner
4 changed files
--- 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

--- a/arch/x86/platform/Makefile
+++ b/arch/x86/platform/Makefile
 # Platform specific code goes here
 obj-y	+= ce4100/
 obj-y	+= efi/
+obj-y	+= iris/
 obj-y	+= mrst/
 obj-y	+= olpc/
 obj-y	+= scx200/

--- a/arch/x86/platform/iris/Makefile
+++ b/arch/x86/platform/iris/Makefile
+obj-$(CONFIG_X86_32_IRIS)		+= iris.o
--- a/arch/x86/kernel/iris.c
+++ b/arch/x86/kernel/iris.c