From 893c2a48abe2bdd3d39eb6d6c1facc596f7f6c0b Mon Sep 17 00:00:00 2001 From: Feng Tang Date: Fri, 3 Dec 2010 11:51:37 +0800 Subject: [PATCH] --- yaml --- r: 224083 b: refs/heads/master c: 991cfffa7c19aa648546aff666595af896e568ba h: refs/heads/master i: 224081: 0c683e9b4f2ed8cbe3ad16e2923c7ac4fde3983e 224079: db0b23afa547cb6f9c31b58bc661a328f647cca6 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/Makefile | 1 - trunk/arch/x86/kernel/early_printk.c | 3 +-- trunk/arch/x86/platform/mrst/Makefile | 1 + trunk/arch/x86/{kernel => platform/mrst}/early_printk_mrst.c | 0 5 files changed, 3 insertions(+), 4 deletions(-) rename trunk/arch/x86/{kernel => platform/mrst}/early_printk_mrst.c (100%) diff --git a/[refs] b/[refs] index 85c98a0019e5..8b01300d972d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4d2ebcab11b308b5b59073578efd33eccd55d46 +refs/heads/master: 991cfffa7c19aa648546aff666595af896e568ba diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile index 9e13763b6092..f60153d5de57 100644 --- a/trunk/arch/x86/kernel/Makefile +++ b/trunk/arch/x86/kernel/Makefile @@ -84,7 +84,6 @@ obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_VM86) += vm86_32.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o -obj-$(CONFIG_EARLY_PRINTK_MRST) += early_printk_mrst.o obj-$(CONFIG_HPET_TIMER) += hpet.o obj-$(CONFIG_APB_TIMER) += apb_timer.o diff --git a/trunk/arch/x86/kernel/early_printk.c b/trunk/arch/x86/kernel/early_printk.c index 4572f25f9325..cd28a350f7f9 100644 --- a/trunk/arch/x86/kernel/early_printk.c +++ b/trunk/arch/x86/kernel/early_printk.c @@ -240,7 +240,7 @@ static int __init setup_early_printk(char *buf) if (!strncmp(buf, "xen", 3)) early_console_register(&xenboot_console, keep); #endif -#ifdef CONFIG_X86_MRST_EARLY_PRINTK +#ifdef CONFIG_EARLY_PRINTK_MRST if (!strncmp(buf, "mrst", 4)) { mrst_early_console_init(); early_console_register(&early_mrst_console, keep); @@ -250,7 +250,6 @@ static int __init setup_early_printk(char *buf) hsu_early_console_init(); early_console_register(&early_hsu_console, keep); } - #endif buf++; } diff --git a/trunk/arch/x86/platform/mrst/Makefile b/trunk/arch/x86/platform/mrst/Makefile index 4d3e256780be..f61ccdd49341 100644 --- a/trunk/arch/x86/platform/mrst/Makefile +++ b/trunk/arch/x86/platform/mrst/Makefile @@ -1,2 +1,3 @@ obj-$(CONFIG_X86_MRST) += mrst.o obj-$(CONFIG_X86_MRST) += vrtc.o +obj-$(CONFIG_EARLY_PRINTK_MRST) += early_printk_mrst.o diff --git a/trunk/arch/x86/kernel/early_printk_mrst.c b/trunk/arch/x86/platform/mrst/early_printk_mrst.c similarity index 100% rename from trunk/arch/x86/kernel/early_printk_mrst.c rename to trunk/arch/x86/platform/mrst/early_printk_mrst.c