aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>2007-08-04 10:24:51 -0400
committerRalf Baechle <ralf@linux-mips.org>2007-08-26 21:16:54 -0400
commitdee3c75058485d55c8188a13d660d72188c5bcee (patch)
treeb2280c847d0b2469237ceaebaad99f221b6eaa25
parent5d3fdeacee5d071a5c3d674231bf00cfa5d35a7a (diff)
[MIPS] SNI: Remove unneeded sni_machine_halt
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/sni/reset.c4
-rw-r--r--arch/mips/sni/setup.c2
2 files changed, 0 insertions, 6 deletions
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)
40 } 40 }
41} 41}
42 42
43void sni_machine_halt(void)
44{
45}
46
47void sni_machine_power_off(void) 43void sni_machine_power_off(void)
48{ 44{
49 *(volatile unsigned char *)PCIMT_CSWCSM = 0xfd; 45 *(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 @@
26unsigned int sni_brd_type; 26unsigned int sni_brd_type;
27 27
28extern void sni_machine_restart(char *command); 28extern void sni_machine_restart(char *command);
29extern void sni_machine_halt(void);
30extern void sni_machine_power_off(void); 29extern void sni_machine_power_off(void);
31 30
32static void __init sni_display_setup(void) 31static void __init sni_display_setup(void)
@@ -87,7 +86,6 @@ void __init plat_mem_setup(void)
87 } 86 }
88 87
89 _machine_restart = sni_machine_restart; 88 _machine_restart = sni_machine_restart;
90 _machine_halt = sni_machine_halt;
91 pm_power_off = sni_machine_power_off; 89 pm_power_off = sni_machine_power_off;
92 90
93 sni_display_setup(); 91 sni_display_setup();