Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] MTX1: clear PCI errors
  [MIPS] MTX1: add idsel cardbus ressources
  [MIPS] MTX1: remove unneeded settings
  [MIPS] dma_sync_sg_for_cpu is a no-op except for non-coherent R10000s.
  [MIPS] Cobalt: update reserved resources
  [MIPS] SN: PCI fixup needs to include <irq.h>.
  [MIPS] DMA: Fix a bunch of warnings due to missing inline keywords.
  [MIPS] RM: It should be #ifdef CONFIG_FOO not #if CONFIG_FOO ...
  [MIPS] Fix and cleanup the mess that a dozen prom_printf variants are.
  [MIPS] DEC: Remove redeclarations of mips_machgroup and mips_machtype.
  [MIPS] No need to write c0_compare in plat_timer_setup
  [MIPS] Convert to RTC-class ds1742 driver
  [MIPS] Oprofile: Add missing break statements.
  [MIPS] jmr3927: build fix
  [MIPS] SNI: Fix mc146818_decode_year
  [MIPS] Replace sys32_timer_create with the generic compat_sys_timer_create.
  [MIPS] Replace sys32_socketcall with the generic compat_sys_socketcall.
  [MIPS] N32 waitid is the same as o32.

1 files changed, 6 insertions, 3 deletions

diff --git a/arch/mips/arc/init.c b/arch/mips/arc/init.c
index 76ab505ca693..0ac8f42d3752 100644
--- a/arch/mips/arc/init.c
+++ b/arch/mips/arc/init.c
@@ -24,12 +24,15 @@ void __init prom_init(void)
 {
         PSYSTEM_PARAMETER_BLOCK pb = PROMBLOCK;
         romvec = ROMVECTOR;
+        ULONG cnt;
+        CHAR c;
+
         prom_argc = fw_arg0;
         _prom_argv = (LONG *) fw_arg1;
         _prom_envp = (LONG *) fw_arg2;
 
         if (pb->magic != 0x53435241) {
-                prom_printf("Aieee, bad prom vector magic %08lx\n", pb->magic);
+                printk(KERN_CRIT "Aieee, bad prom vector magic %08lx\n", pb->magic);
                 while(1)
                         ;
         }
@@ -41,8 +44,8 @@ void __init prom_init(void)
         prom_meminit();
 
 #ifdef DEBUG_PROM_INIT
-        prom_printf("Press a key to reboot\n");
-        prom_getchar();
+        pr_info("Press a key to reboot\n");
+        ArcRead(0, &c, 1, &cnt);
         ArcEnterInteractiveMode();
 #endif
 }