Commit-ID: 9cdca869724e766eb48c061967cb777ddb436c76
Gitweb: http://git.kernel.org/tip/9cdca869724e766eb48c061967cb777ddb436c76
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate: Sat, 20 Nov 2010 10:37:05 +0100
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Sat, 20 Nov 2010 10:37:05 +0100
x86: platform: Move iris to x86/platform where it belongs
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
arch/x86/kernel/Makefile | 1 -
arch/x86/platform/Makefile | 1 +
arch/x86/platform/iris/Makefile | 1 +
arch/x86/{kernel => platform/iris}/iris.c | 0
4 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index beac17a..9e13763 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 a019bc3..021eee9 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 0000000..db92198
--- /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
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|