diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-11-20 10:37:05 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-11-20 10:37:05 +0100 |
| commit | 9cdca869724e766eb48c061967cb777ddb436c76 (patch) | |
| tree | 25dc8f57996611bd6966c456b388c5fbf53b9f99 | |
| parent | 5ca9afdb9f6a5267927b54de3f42c756e8af7fcd (diff) | |
| download | linux-9cdca869724e766eb48c061967cb777ddb436c76.tar.bz2 | |
x86: platform: Move iris to x86/platform where it belongs
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/x86/kernel/Makefile | 1 | ||||
| -rw-r--r-- | arch/x86/platform/Makefile | 1 | ||||
| -rw-r--r-- | arch/x86/platform/iris/Makefile | 1 | ||||
| -rw-r--r-- | arch/x86/platform/iris/iris.c (renamed from arch/x86/kernel/iris.c) | 0 |
4 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index beac17a0fcab..9e13763b6092 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 a019bc3088a0..021eee91c056 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 000000000000..db921983a102 --- /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 index 1ba7f5ed8c9b..1ba7f5ed8c9b 100644 --- a/arch/x86/kernel/iris.c +++ b/arch/x86/platform/iris/iris.c |