Pull cpuidle into release branch

[pandora-kernel.git] / arch / mips / mips-boards / malta / malta_setup.c

diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c
index 7873932..9a2636e 100644 (file)
--- a/arch/mips/mips-boards/malta/malta_setup.c
+++ b/arch/mips/mips-boards/malta/malta_setup.c
@@ -36,7 +36,6 @@
 #endif
 
 extern void mips_reboot_setup(void);
-extern void mips_time_init(void);
 extern unsigned long mips_rtc_get_time(void);
 
 #ifdef CONFIG_KGDB
@@ -56,6 +55,12 @@ const char *get_system_type(void)
        return "MIPS Malta";
 }
 
+#if defined(CONFIG_MIPS_MT_SMTC)
+const char display_string[] = "       SMTC LINUX ON MALTA       ";
+#else
+const char display_string[] = "        LINUX ON MALTA       ";
+#endif /* CONFIG_MIPS_MT_SMTC */
+
 #ifdef CONFIG_BLK_DEV_FD
 void __init fd_activate(void)
 {
@@ -94,18 +99,16 @@ void __init plat_mem_setup(void)
        enable_dma(4);
 
 #ifdef CONFIG_KGDB
-       kgdb_config ();
+       kgdb_config();
 #endif
 
-       if ((mips_revision_corid == MIPS_REVISION_CORID_BONITO64) ||
-           (mips_revision_corid == MIPS_REVISION_CORID_CORE_20K) ||
-           (mips_revision_corid == MIPS_REVISION_CORID_CORE_EMUL_BON)) {
+       if (mips_revision_sconid == MIPS_REVISION_SCON_BONITO) {
                char *argptr;
 
                argptr = prom_getcmdline();
                if (strstr(argptr, "debug")) {
                        BONITO_BONGENCFG |= BONITO_BONGENCFG_DEBUGMODE;
-                       printk ("Enabled Bonito debug mode\n");
+                       printk("Enabled Bonito debug mode\n");
                }
                else
                        BONITO_BONGENCFG &= ~BONITO_BONGENCFG_DEBUGMODE;
@@ -156,14 +159,14 @@ void __init plat_mem_setup(void)
                if (pciclock != 33 && !strstr (argptr, "idebus=")) {
                        printk("WARNING: PCI clock is %dMHz, setting idebus\n", pciclock);
                        argptr += strlen(argptr);
-                       sprintf (argptr, " idebus=%d", pciclock);
+                       sprintf(argptr, " idebus=%d", pciclock);
                        if (pciclock < 20 || pciclock > 66)
-                               printk ("WARNING: IDE timing calculations will be incorrect\n");
+                               printk("WARNING: IDE timing calculations will be incorrect\n");
                }
        }
 #endif
 #ifdef CONFIG_BLK_DEV_FD
-       fd_activate ();
+       fd_activate();
 #endif
 #ifdef CONFIG_VT
 #if defined(CONFIG_VGA_CONSOLE)
@@ -173,7 +176,7 @@ void __init plat_mem_setup(void)
                0,                      /* orig-video-page */
                0,                      /* orig-video-mode */
                80,                     /* orig-video-cols */
-               0,0,0,                  /* ega_ax, ega_bx, ega_cx */
+               0, 0, 0,                /* ega_ax, ega_bx, ega_cx */
                25,                     /* orig-video-lines */
                VIDEO_TYPE_VGAC,        /* orig-video-isVGA */
                16                      /* orig-video-points */
@@ -181,7 +184,4 @@ void __init plat_mem_setup(void)
 #endif
 #endif
        mips_reboot_setup();
-
-       board_time_init = mips_time_init;
-       rtc_mips_get_time = mips_rtc_get_time;
 }