summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-10-16 10:38:13 +0200
committerThomas Gleixner <tglx@linutronix.de>2010-10-27 14:30:01 +0200
commit9694d4afc1ebe1e46cacfb78b107cd8f9fb550ba (patch)
tree0392e3ebde16133776fe2cf83f02997bbd7942d2
parent3b3da9d25ae9d8cac99302ad66834499cf324d08 (diff)
downloadblackbird-op-linux-9694d4afc1ebe1e46cacfb78b107cd8f9fb550ba.tar.gz
blackbird-op-linux-9694d4afc1ebe1e46cacfb78b107cd8f9fb550ba.zip
x86: Move mrst to platform
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Jacob Pan <jacob.jun.pan@intel.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
-rw-r--r--arch/x86/kernel/Makefile1
-rw-r--r--arch/x86/platform/Makefile1
-rw-r--r--arch/x86/platform/mrst/Makefile1
-rw-r--r--arch/x86/platform/mrst/mrst.c (renamed from arch/x86/kernel/mrst.c)0
4 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index f57eeea4bc16..4e1f862dd688 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -104,7 +104,6 @@ obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o
obj-$(CONFIG_OLPC) += olpc.o
obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o
obj-$(CONFIG_OLPC_OPENFIRMWARE) += olpc_ofw.o
-obj-$(CONFIG_X86_MRST) += mrst.o
microcode-y := microcode_core.o
microcode-$(CONFIG_MICROCODE_INTEL) += microcode_intel.o
diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile
index 1191989e9f00..06761ed53747 100644
--- a/arch/x86/platform/Makefile
+++ b/arch/x86/platform/Makefile
@@ -1,5 +1,6 @@
# Platform specific code goes here
obj-y += efi/
+obj-y += mrst/
obj-y += scx200/
obj-y += sfi/
obj-y += visws/
diff --git a/arch/x86/platform/mrst/Makefile b/arch/x86/platform/mrst/Makefile
new file mode 100644
index 000000000000..efbbc552fa95
--- /dev/null
+++ b/arch/x86/platform/mrst/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_X86_MRST) += mrst.o
diff --git a/arch/x86/kernel/mrst.c b/arch/x86/platform/mrst/mrst.c
index 79ae68154e87..79ae68154e87 100644
--- a/arch/x86/kernel/mrst.c
+++ b/arch/x86/platform/mrst/mrst.c
OpenPOWER on IntegriCloud