3 files changed, 0 insertions, 43 deletions

diff --git a/arch/mips/sni/pcimt_scache.c b/arch/mips/sni/pcimt_scache.c
deleted file mode 100644
index a59d457fa8b1..000000000000
--- a/arch/mips/sni/pcimt_scache.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * arch/mips/sni/pcimt_scache.c
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (c) 1997, 1998 by Ralf Baechle
- */
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <asm/bcache.h>
-#include <asm/sni.h>
-
-#define cacheconf (*(volatile unsigned int *)PCIMT_CACHECONF)
-#define invspace (*(volatile unsigned int *)PCIMT_INVSPACE)
-
-void __init sni_pcimt_sc_init(void)
-{
-        unsigned int scsiz, sc_size;
-
-        scsiz = cacheconf & 7;
-        if (scsiz == 0) {
-                printk("Second level cache is deactived.\n");
-                return;
-        }
-        if (scsiz >= 6) {
-                printk("Invalid second level cache size configured, "
-                       "deactivating second level cache.\n");
-                cacheconf = 0;
-                return;
-        }
-
-        sc_size = 128 << scsiz;
-        printk("%dkb second level cache detected, deactivating.\n", sc_size);
-        cacheconf = 0;
-}
diff --git a/arch/mips/sni/reset.c b/arch/mips/sni/reset.c
index 2eada8aea682..38b6a97a31b5 100644
--- a/arch/mips/sni/reset.c
+++ b/arch/mips/sni/reset.c
@@ -40,10 +40,6 @@ void sni_machine_restart(char *command)
         }
 }
 
-void sni_machine_halt(void)
-{
-}
-
 void sni_machine_power_off(void)
 {
         *(volatile unsigned char *)PCIMT_CSWCSM = 0xfd;
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c
index 4fedfbda0c79..6edbb3051c82 100644
--- a/arch/mips/sni/setup.c
+++ b/arch/mips/sni/setup.c
@@ -26,7 +26,6 @@
 unsigned int sni_brd_type;
 
 extern void sni_machine_restart(char *command);
-extern void sni_machine_halt(void);
 extern void sni_machine_power_off(void);
 
 static void __init sni_display_setup(void)
@@ -87,7 +86,6 @@ void __init plat_mem_setup(void)
         }
 
         _machine_restart = sni_machine_restart;
-        _machine_halt = sni_machine_halt;
         pm_power_off = sni_machine_power_off;
 
         sni_display_setup();