diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-10-16 04:38:13 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-10-27 08:30:01 -0400 |
| commit | 9694d4afc1ebe1e46cacfb78b107cd8f9fb550ba (patch) | |
| tree | 0392e3ebde16133776fe2cf83f02997bbd7942d2 /arch/x86 | |
| parent | 3b3da9d25ae9d8cac99302ad66834499cf324d08 (diff) | |
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>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/Makefile | 1 | ||||
| -rw-r--r-- | arch/x86/platform/Makefile | 1 | ||||
| -rw-r--r-- | arch/x86/platform/mrst/Makefile | 1 | ||||
| -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 | |||
| 104 | obj-$(CONFIG_OLPC) += olpc.o | 104 | obj-$(CONFIG_OLPC) += olpc.o |
| 105 | obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o | 105 | obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o |
| 106 | obj-$(CONFIG_OLPC_OPENFIRMWARE) += olpc_ofw.o | 106 | obj-$(CONFIG_OLPC_OPENFIRMWARE) += olpc_ofw.o |
| 107 | obj-$(CONFIG_X86_MRST) += mrst.o | ||
| 108 | 107 | ||
| 109 | microcode-y := microcode_core.o | 108 | microcode-y := microcode_core.o |
| 110 | microcode-$(CONFIG_MICROCODE_INTEL) += microcode_intel.o | 109 | 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 @@ | |||
| 1 | # Platform specific code goes here | 1 | # Platform specific code goes here |
| 2 | obj-y += efi/ | 2 | obj-y += efi/ |
| 3 | obj-y += mrst/ | ||
| 3 | obj-y += scx200/ | 4 | obj-y += scx200/ |
| 4 | obj-y += sfi/ | 5 | obj-y += sfi/ |
| 5 | obj-y += visws/ | 6 | 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 | |||