On Sun, Jul 22, 2007 at 01:06:49PM +0900, Yoichi Yuasa wrote:
> remove unneeded reset function for jazz
Thanks, ok? Or do you instead want to put something into these functions?
Ralf
> Signed-off-by: Yoichi Yuasa <yoichi_yuasa@xxxxxxxxxxxxxx>
>
> diff -pruN -X generic/Documentation/dontdiff generic-orig/arch/mips/jazz/reset.c generic/arch/mips/jazz/reset.c
> --- generic-orig/arch/mips/jazz/reset.c 2007-07-21 21:55:08.089094250 +0900
> +++ generic/arch/mips/jazz/reset.c 2007-07-21 22:22:10.724855500 +0900
> @@ -6,10 +6,6 @@
> */
> #include <linux/jiffies.h>
> #include <asm/jazz.h>
> -#include <asm/io.h>
> -#include <asm/system.h>
> -#include <asm/reboot.h>
> -#include <asm/delay.h>
>
> #define KBD_STAT_IBF 0x02 /* Keyboard input buffer full */
>
> @@ -58,12 +54,3 @@ void jazz_machine_restart(char *command)
> jazz_write_output (0x00);
> }
> }
> -
> -void jazz_machine_halt(void)
> -{
> -}
> -
> -void jazz_machine_power_off(void)
> -{
> - /* Jazz machines don't have a software power switch */
> -}
> diff -pruN -X generic/Documentation/dontdiff generic-orig/arch/mips/jazz/setup.c generic/arch/mips/jazz/setup.c
> --- generic-orig/arch/mips/jazz/setup.c 2007-07-21 21:55:08.101095000 +0900
> +++ generic/arch/mips/jazz/setup.c 2007-07-21 22:20:20.045938500 +0900
> @@ -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 */
Ralf
