git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
arch
/
mips
/
emma2rh
/
common
/
prom.c
diff --git
a/arch/mips/emma2rh/common/prom.c
b/arch/mips/emma2rh/common/prom.c
index
0f791eb
..
5e92b3a
100644
(file)
--- a/
arch/mips/emma2rh/common/prom.c
+++ b/
arch/mips/emma2rh/common/prom.c
@@
-34,12
+34,11
@@
const char *get_system_type(void)
{
const char *get_system_type(void)
{
- switch (mips_machtype) {
- case MACH_NEC_MARKEINS:
- return "NEC EMMA2RH Mark-eins";
- default:
- return "Unknown NEC board";
- }
+#if defined(CONFIG_MARKEINS)
+ return "NEC EMMA2RH Mark-eins";
+#else
+#error Unknown NEC board
+#endif
}
/* [jsun@junsun.net] PMON passes arguments in C main() style */
}
/* [jsun@junsun.net] PMON passes arguments in C main() style */
@@
-63,10
+62,10
@@
void __init prom_init(void)
}
#if defined(CONFIG_MARKEINS)
}
#if defined(CONFIG_MARKEINS)
- mips_machtype = MACH_NEC_MARKEINS;
add_memory_region(0, EMMA2RH_RAM_SIZE, BOOT_MEM_RAM);
add_memory_region(0, EMMA2RH_RAM_SIZE, BOOT_MEM_RAM);
+#else
+#error Unknown NEC board
#endif
#endif
-
}
void __init prom_free_prom_memory(void)
}
void __init prom_free_prom_memory(void)