Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[sfrench/cifs-2.6.git] / arch / mips / jazz / setup.c

diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c
index 81ec559a1c26b6e6c43fd2d759ce0b1533bd211e..798279e066918fff48ce20757c3363183f4f10f1 100644 (file)
--- a/arch/mips/jazz/setup.c
+++ b/arch/mips/jazz/setup.c
@@ -34,8 +34,6 @@
 extern asmlinkage void jazz_handle_int(void);
 
 extern void jazz_machine_restart(char *command);
-extern void jazz_machine_halt(void);
-extern void jazz_machine_power_off(void);
 
 void __init plat_timer_setup(struct irqaction *irq)
 {
@@ -95,8 +93,6 @@ void __init plat_mem_setup(void)
        /* The RTC is outside the port address space */
 
        _machine_restart = jazz_machine_restart;
-       _machine_halt = jazz_machine_halt;
-       pm_power_off = jazz_machine_power_off;
 
        screen_info = (struct screen_info) {
                0, 0,           /* orig-x, orig-y */