Pull video-2.6.24 into release branch

[linux-2.6-omap-h63xx.git] / arch / mips / sni / reset.c

diff --git a/arch/mips/sni/reset.c b/arch/mips/sni/reset.c
index 2eada8aea68263d5ac6b471802f89f0a3df0d428..79f8d70f48c9617875357a57bbdfa428a041318d 100644 (file)
--- a/arch/mips/sni/reset.c
+++ b/arch/mips/sni/reset.c
@@ -35,15 +35,11 @@ void sni_machine_restart(char *command)
                        kb_wait();
                        for (j = 0; j < 100000 ; j++)
                                /* nothing */;
-                       outb_p(0xfe,0x64);       /* pulse reset low */
+                       outb_p(0xfe, 0x64);      /* pulse reset low */
                }
        }
 }
 
-void sni_machine_halt(void)
-{
-}
-
 void sni_machine_power_off(void)
 {
        *(volatile unsigned char *)PCIMT_CSWCSM = 0xfd;