From ca5af3bc3b67ca7b7c24870fef3909f457c5d43e Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 20 Nov 2010 10:37:05 +0100 Subject: [PATCH] --- yaml --- r: 224080 b: refs/heads/master c: 9cdca869724e766eb48c061967cb777ddb436c76 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/Makefile | 1 - trunk/arch/x86/platform/Makefile | 1 + trunk/arch/x86/platform/iris/Makefile | 1 + trunk/arch/x86/{kernel => platform/iris}/iris.c | 0 5 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 trunk/arch/x86/platform/iris/Makefile rename trunk/arch/x86/{kernel => platform/iris}/iris.c (100%) diff --git a/[refs] b/[refs] index 9ce66c5be5cc..12acb798694e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ca9afdb9f6a5267927b54de3f42c756e8af7fcd +refs/heads/master: 9cdca869724e766eb48c061967cb777ddb436c76 diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile index beac17a0fcab..9e13763b6092 100644 --- a/trunk/arch/x86/kernel/Makefile +++ b/trunk/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/trunk/arch/x86/platform/Makefile b/trunk/arch/x86/platform/Makefile index a019bc3088a0..021eee91c056 100644 --- a/trunk/arch/x86/platform/Makefile +++ b/trunk/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/trunk/arch/x86/platform/iris/Makefile b/trunk/arch/x86/platform/iris/Makefile new file mode 100644 index 000000000000..db921983a102 --- /dev/null +++ b/trunk/arch/x86/platform/iris/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_X86_32_IRIS) += iris.o diff --git a/trunk/arch/x86/kernel/iris.c b/trunk/arch/x86/platform/iris/iris.c similarity index 100% rename from trunk/arch/x86/kernel/iris.c rename to trunk/arch/x86/platform/iris/iris.c