From 675492636b990bd39d421f2a4563883258b999ac Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 5 Nov 2011 14:41:14 +0000 Subject: [PATCH] --- yaml --- r: 279987 b: refs/heads/master c: b95ff9fe24e8757380bd9b53891df86f2499ebb8 h: refs/heads/master i: 279985: e68ccccc7e8e9b9a70eb141c3ea043708abbf208 279983: 7bba096dc1fe993ead156a018f7c08333deaad27 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shark/core.c | 3 ++- trunk/arch/arm/mach-shark/include/mach/system.h | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 833f5e549e89..ec3b9cb14799 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9ca5839fd4b0c820c19401b72962a1d099cb99e +refs/heads/master: b95ff9fe24e8757380bd9b53891df86f2499ebb8 diff --git a/trunk/arch/arm/mach-shark/core.c b/trunk/arch/arm/mach-shark/core.c index f4b25d875f3d..a851c254ad6c 100644 --- a/trunk/arch/arm/mach-shark/core.c +++ b/trunk/arch/arm/mach-shark/core.c @@ -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 diff --git a/trunk/arch/arm/mach-shark/include/mach/system.h b/trunk/arch/arm/mach-shark/include/mach/system.h index 21c373b30bbc..2cc363a3cd90 100644 --- a/trunk/arch/arm/mach-shark/include/mach/system.h +++ b/trunk/arch/arm/mach-shark/include/mach/system.h @@ -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) {