aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/sni/reset.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-08-28 15:56:11 +1000
committerPaul Mackerras <paulus@samba.org>2007-08-28 15:56:11 +1000
commit35438c4327df18dbf5e7f597b69299119f4a14de (patch)
treea4589d731015db93f2eba8f84ffb1f48a8084020 /arch/mips/sni/reset.c
parent2f6c9d961081dc7b109eb19166244bcb2a5dfc28 (diff)
parentb07d68b5ca4d55a16fab223d63d5fb36f89ff42f (diff)
downloadkernel_samsung_tuna-35438c4327df18dbf5e7f597b69299119f4a14de.zip
kernel_samsung_tuna-35438c4327df18dbf5e7f597b69299119f4a14de.tar.gz
kernel_samsung_tuna-35438c4327df18dbf5e7f597b69299119f4a14de.tar.bz2
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'arch/mips/sni/reset.c')
-rw-r--r--arch/mips/sni/reset.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/mips/sni/reset.c b/arch/mips/sni/reset.c
index 2eada8a..38b6a97 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;