Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b95ff9fe authored by Russell King's avatar Russell King
Browse files

ARM: restart: shark: use new restart hook 



Hook the Shark restart code into the new restart hook rather than
using arch_reset().

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d9ca5839

arch/arm/mach-shark/core.c

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#define ROMCARD_SIZE            0x08000000

#define ROMCARD_START           0x10000000



void arch_reset(char mode, const char *cmd)

static void shark_restart(char mode, const char *cmd)

{

        short temp;

        /* Reset the Machine via pc[3] of the sequoia chipset */
@@ -156,4 +156,5 @@ MACHINE_START(SHARK, "Shark") 
	.init_irq	= shark_init_irq,

	.timer		= &shark_timer,

	.dma_zone_size	= SZ_4M,

	.restart	= shark_restart,

MACHINE_END

arch/arm/mach-shark/include/mach/system.h

+3 −2
Original line number Diff line number Diff line
@@ -6,8 +6,9 @@ 
#ifndef __ASM_ARCH_SYSTEM_H

#define __ASM_ARCH_SYSTEM_H



/* Found in arch/mach-shark/core.c */

extern void arch_reset(char mode, const char *cmd);

static inline void arch_reset(char mode, const char *cmd)

{

}



static inline void arch_idle(void)

{