diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:02:45 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:02:45 +0200 |
commit | e27772b48df91a954a74b1411b57d83b945a58c7 (patch) | |
tree | ebd4a434d9e3cbd0844109e4469f91daac581b59 /arch/mips/txx9/rbtx4927/prom.c | |
parent | d092633bff3b19faffc480fe9810805e7792a029 (diff) | |
parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'arch/mips/txx9/rbtx4927/prom.c')
-rw-r--r-- | arch/mips/txx9/rbtx4927/prom.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/mips/txx9/rbtx4927/prom.c b/arch/mips/txx9/rbtx4927/prom.c index 942e627d2dc..5c0de54ebdd 100644 --- a/arch/mips/txx9/rbtx4927/prom.c +++ b/arch/mips/txx9/rbtx4927/prom.c @@ -36,10 +36,6 @@ void __init rbtx4927_prom_init(void) { - extern int tx4927_get_mem_size(void); - int msize; - prom_init_cmdline(); - msize = tx4927_get_mem_size(); - add_memory_region(0, msize << 20, BOOT_MEM_RAM); + add_memory_region(0, tx4927_get_mem_size(), BOOT_MEM_RAM); } |