From f5274e605618067c08b87f410823b2d138bef15a Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 16 Oct 2010 10:38:13 +0200 Subject: [PATCH] --- yaml --- r: 220527 b: refs/heads/master c: 9694d4afc1ebe1e46cacfb78b107cd8f9fb550ba h: refs/heads/master i: 220525: e24d3dc2b599980c401486eb6e7a1d18c2ced2ed 220523: 685896442856cc983af3dfa96b18ff29ecf4a380 220519: 55472806f5aefb847a5bda1a7da0e6ab58123428 220511: 14288566c877d031a67c55e82e59e557570f73a8 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/Makefile | 1 - trunk/arch/x86/platform/Makefile | 1 + trunk/arch/x86/platform/mrst/Makefile | 1 + trunk/arch/x86/{kernel => platform/mrst}/mrst.c | 0 5 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 trunk/arch/x86/platform/mrst/Makefile rename trunk/arch/x86/{kernel => platform/mrst}/mrst.c (100%) diff --git a/[refs] b/[refs] index ac4b05de5083..361f78d71fac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b3da9d25ae9d8cac99302ad66834499cf324d08 +refs/heads/master: 9694d4afc1ebe1e46cacfb78b107cd8f9fb550ba diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile index f57eeea4bc16..4e1f862dd688 100644 --- a/trunk/arch/x86/kernel/Makefile +++ b/trunk/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/trunk/arch/x86/platform/Makefile b/trunk/arch/x86/platform/Makefile index 1191989e9f00..06761ed53747 100644 --- a/trunk/arch/x86/platform/Makefile +++ b/trunk/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/trunk/arch/x86/platform/mrst/Makefile b/trunk/arch/x86/platform/mrst/Makefile new file mode 100644 index 000000000000..efbbc552fa95 --- /dev/null +++ b/trunk/arch/x86/platform/mrst/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_X86_MRST) += mrst.o diff --git a/trunk/arch/x86/kernel/mrst.c b/trunk/arch/x86/platform/mrst/mrst.c similarity index 100% rename from trunk/arch/x86/kernel/mrst.c rename to trunk/arch/x86/platform/mrst/mrst.c