aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/mips/jazz/reset.c13
-rw-r--r--arch/mips/jazz/setup.c4
2 files changed, 0 insertions, 17 deletions
diff --git a/arch/mips/jazz/reset.c b/arch/mips/jazz/reset.c
index 2a9754750bc8..d8ade85060b3 100644
--- a/arch/mips/jazz/reset.c
+++ b/arch/mips/jazz/reset.c
@@ -6,10 +6,6 @@
6 */ 6 */
7#include <linux/jiffies.h> 7#include <linux/jiffies.h>
8#include <asm/jazz.h> 8#include <asm/jazz.h>
9#include <asm/io.h>
10#include <asm/system.h>
11#include <asm/reboot.h>
12#include <asm/delay.h>
13 9
14#define KBD_STAT_IBF 0x02 /* Keyboard input buffer full */ 10#define KBD_STAT_IBF 0x02 /* Keyboard input buffer full */
15 11
@@ -58,12 +54,3 @@ void jazz_machine_restart(char *command)
58 jazz_write_output (0x00); 54 jazz_write_output (0x00);
59 } 55 }
60} 56}
61
62void jazz_machine_halt(void)
63{
64}
65
66void jazz_machine_power_off(void)
67{
68 /* Jazz machines don't have a software power switch */
69}
diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c
index 81ec559a1c26..798279e06691 100644
--- a/arch/mips/jazz/setup.c
+++ b/arch/mips/jazz/setup.c
@@ -34,8 +34,6 @@
34extern asmlinkage void jazz_handle_int(void); 34extern asmlinkage void jazz_handle_int(void);
35 35
36extern void jazz_machine_restart(char *command); 36extern void jazz_machine_restart(char *command);
37extern void jazz_machine_halt(void);
38extern void jazz_machine_power_off(void);
39 37
40void __init plat_timer_setup(struct irqaction *irq) 38void __init plat_timer_setup(struct irqaction *irq)
41{ 39{
@@ -95,8 +93,6 @@ void __init plat_mem_setup(void)
95 /* The RTC is outside the port address space */ 93 /* The RTC is outside the port address space */
96 94
97 _machine_restart = jazz_machine_restart; 95 _machine_restart = jazz_machine_restart;
98 _machine_halt = jazz_machine_halt;
99 pm_power_off = jazz_machine_power_off;
100 96
101 screen_info = (struct screen_info) { 97 screen_info = (struct screen_info) {
102 0, 0, /* orig-x, orig-y */ 98 0, 0, /* orig-x, orig-y */