diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 09:06:09 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 09:06:09 -0400 |
| commit | e66d90fb4abd0a27ee96f57a32fb561221c4d6ae (patch) | |
| tree | 3337cba94c7444b06fdb0e8b487287d07b71f4a0 /arch/mips/txx9/rbtx4938/prom.c | |
| parent | 55ca089e2579de90f048aca2a3030b8b2f864813 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into xen-64bit
Diffstat (limited to 'arch/mips/txx9/rbtx4938/prom.c')
| -rw-r--r-- | arch/mips/txx9/rbtx4938/prom.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/mips/txx9/rbtx4938/prom.c b/arch/mips/txx9/rbtx4938/prom.c index fbb37458ddb2..ee189519ce5a 100644 --- a/arch/mips/txx9/rbtx4938/prom.c +++ b/arch/mips/txx9/rbtx4938/prom.c | |||
| @@ -18,12 +18,8 @@ | |||
| 18 | 18 | ||
| 19 | void __init rbtx4938_prom_init(void) | 19 | void __init rbtx4938_prom_init(void) |
| 20 | { | 20 | { |
| 21 | extern int tx4938_get_mem_size(void); | ||
| 22 | int msize; | ||
| 23 | #ifndef CONFIG_TX4938_NAND_BOOT | 21 | #ifndef CONFIG_TX4938_NAND_BOOT |
| 24 | prom_init_cmdline(); | 22 | prom_init_cmdline(); |
| 25 | #endif | 23 | #endif |
| 26 | 24 | add_memory_region(0, tx4938_get_mem_size(), BOOT_MEM_RAM); | |
| 27 | msize = tx4938_get_mem_size(); | ||
| 28 | add_memory_region(0, msize << 20, BOOT_MEM_RAM); | ||
| 29 | } | 25 | } |