diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/mips/mti-malta/malta-init.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/mips/mti-malta/malta-init.c')
| -rw-r--r-- | arch/mips/mti-malta/malta-init.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/mti-malta/malta-init.c b/arch/mips/mti-malta/malta-init.c index f1b14c8a4a1c..414f0c99b196 100644 --- a/arch/mips/mti-malta/malta-init.c +++ b/arch/mips/mti-malta/malta-init.c | |||
| @@ -355,7 +355,6 @@ void __init prom_init(void) | |||
| 355 | board_nmi_handler_setup = mips_nmi_setup; | 355 | board_nmi_handler_setup = mips_nmi_setup; |
| 356 | board_ejtag_handler_setup = mips_ejtag_setup; | 356 | board_ejtag_handler_setup = mips_ejtag_setup; |
| 357 | 357 | ||
| 358 | pr_info("\nLINUX started...\n"); | ||
| 359 | prom_init_cmdline(); | 358 | prom_init_cmdline(); |
| 360 | prom_meminit(); | 359 | prom_meminit(); |
| 361 | #ifdef CONFIG_SERIAL_8250_CONSOLE | 360 | #ifdef CONFIG_SERIAL_8250_CONSOLE |