git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
mips
/
tx4927
/
toshiba_rbtx4927
/
toshiba_rbtx4927_prom.c
diff --git
a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c
b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c
index
e4d095d
..
efe5056
100644
(file)
--- a/
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c
+++ b/
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c
@@
-60,7
+60,6
@@
void __init prom_init_cmdline(void)
void __init prom_init(void)
{
void __init prom_init(void)
{
- const char* toshiba_name_list[] = GROUP_TOSHIBA_NAMES;
extern int tx4927_get_mem_size(void);
extern char* toshiba_name;
int msize;
extern int tx4927_get_mem_size(void);
extern char* toshiba_name;
int msize;
@@
-69,12
+68,13
@@
void __init prom_init(void)
mips_machgroup = MACH_GROUP_TOSHIBA;
mips_machgroup = MACH_GROUP_TOSHIBA;
- if ((read_c0_prid() & 0xff) == PRID_REV_TX4927)
+ if ((read_c0_prid() & 0xff) == PRID_REV_TX4927)
{
mips_machtype = MACH_TOSHIBA_RBTX4927;
mips_machtype = MACH_TOSHIBA_RBTX4927;
- else
+ toshiba_name = "TX4927";
+ } else {
mips_machtype = MACH_TOSHIBA_RBTX4937;
mips_machtype = MACH_TOSHIBA_RBTX4937;
-
- toshiba_name = toshiba_name_list[mips_machtype];
+ toshiba_name = "TX4937";
+ }
msize = tx4927_get_mem_size();
add_memory_region(0, msize << 20, BOOT_MEM_RAM);
msize = tx4927_get_mem_size();
add_memory_region(0, msize << 20, BOOT_MEM_RAM);