summaryrefslogtreecommitdiffstats
path: root/arch/mips/emma2rh/common/prom.c
diff options
context:
space:
mode:
authorShinya Kuribayashi <skuribay@ruby.dti.ne.jp>2008-10-24 06:00:01 +0900
committerRalf Baechle <ralf@linux-mips.org>2008-10-27 16:18:29 +0000
commitcd741b604b94a4d5bebf2672626ffec7de44652c (patch)
treee810e98d22c1aec0628602be9a980c02e15212f1 /arch/mips/emma2rh/common/prom.c
parent542c1020ac1cbc2f50934086ad893384a2cbd233 (diff)
downloadop-kernel-dev-cd741b604b94a4d5bebf2672626ffec7de44652c.zip
op-kernel-dev-cd741b604b94a4d5bebf2672626ffec7de44652c.tar.gz
MIPS: EMMA: Kconfig reorganization
- Move EMMA related stuff into arch/mips/emma/Kconfig - Create CONFIG_SOC_EMMA* to handle more EMMA SoCs effectively - Rename CONFIG_MARKEINS into CONFIG_NEC_MARKEINS Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/emma2rh/common/prom.c')
-rw-r--r--arch/mips/emma2rh/common/prom.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/emma2rh/common/prom.c b/arch/mips/emma2rh/common/prom.c
index e14a2e3..97bf29e 100644
--- a/arch/mips/emma2rh/common/prom.c
+++ b/arch/mips/emma2rh/common/prom.c
@@ -33,7 +33,7 @@
const char *get_system_type(void)
{
-#if defined(CONFIG_MARKEINS)
+#ifdef CONFIG_NEC_MARKEINS
return "NEC EMMA2RH Mark-eins";
#else
#error Unknown NEC board
@@ -60,7 +60,7 @@ void __init prom_init(void)
strcat(arcs_cmdline, " ");
}
-#if defined(CONFIG_MARKEINS)
+#ifdef CONFIG_NEC_MARKEINS
add_memory_region(0, EMMA2RH_RAM_SIZE, BOOT_MEM_RAM);
#else
#error Unknown NEC board
OpenPOWER on IntegriCloud