diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:35:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:37:32 -0400 |
| commit | 365d46dc9be9b3c833990a06f3994b1987eda578 (patch) | |
| tree | 9397d1304144a288411f2118707f44ff5e862fa6 /arch/mips/txx9/rbtx4927/prom.c | |
| parent | 5dc64a3442b98eaa0e3730c35fcf00cf962a93e7 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/xen
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process_64.c
arch/x86/xen/enlighten.c
Diffstat (limited to 'arch/mips/txx9/rbtx4927/prom.c')
| -rw-r--r-- | arch/mips/txx9/rbtx4927/prom.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/txx9/rbtx4927/prom.c b/arch/mips/txx9/rbtx4927/prom.c index 1dc0a5b1956b..cc97c6a6011b 100644 --- a/arch/mips/txx9/rbtx4927/prom.c +++ b/arch/mips/txx9/rbtx4927/prom.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | 36 | ||
| 37 | void __init rbtx4927_prom_init(void) | 37 | void __init rbtx4927_prom_init(void) |
| 38 | { | 38 | { |
| 39 | prom_init_cmdline(); | ||
| 40 | add_memory_region(0, tx4927_get_mem_size(), BOOT_MEM_RAM); | 39 | add_memory_region(0, tx4927_get_mem_size(), BOOT_MEM_RAM); |
| 41 | txx9_sio_putchar_init(TX4927_SIO_REG(0) & 0xfffffffffULL); | 40 | txx9_sio_putchar_init(TX4927_SIO_REG(0) & 0xfffffffffULL); |
| 42 | } | 41 | } |