From: Thomas Gleixner Date: Sat, 16 Oct 2010 08:38:13 +0000 (+0200) Subject: x86: Move mrst to platform X-Git-Tag: v2.6.37-rc1~58^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9694d4afc1ebe1e46cacfb78b107cd8f9fb550ba;p=thirdparty%2Fkernel%2Flinux.git x86: Move mrst to platform Signed-off-by: Thomas Gleixner Cc: Jacob Pan Cc: Alan Cox --- diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index f57eeea4bc161..4e1f862dd688a 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 1191989e9f00e..06761ed537479 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 0000000000000..efbbc552fa953 --- /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 similarity index 100% rename from arch/x86/kernel/mrst.c rename to arch/x86/platform/mrst/mrst.c