From 0afaf21b2c43277e67a048e3a09a611ede36c037 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 5 Nov 2011 11:16:05 +0000
Subject: [PATCH] --- yaml --- r: 279957 b: refs/heads/master c:
 00e9967e0dfa0d4c871ac3be5bd1cb28348e68d3 h: refs/heads/master i:   279955:
 5f39c3e988b750079573f69356b43d88cc60c5ee v: v3

---
 [refs]                                             | 2 +-
 trunk/arch/arm/mach-highbank/core.h                | 1 +
 trunk/arch/arm/mach-highbank/highbank.c            | 1 +
 trunk/arch/arm/mach-highbank/include/mach/system.h | 4 +++-
 trunk/arch/arm/mach-highbank/system.c              | 2 +-
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cd7f57738a98..2c8db7b397a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d68370b246dad8c4a94c3a49d700622664ad89a
+refs/heads/master: 00e9967e0dfa0d4c871ac3be5bd1cb28348e68d3
diff --git a/trunk/arch/arm/mach-highbank/core.h b/trunk/arch/arm/mach-highbank/core.h
index 7e33fc94cd1e..d8e2d0be64ac 100644
--- a/trunk/arch/arm/mach-highbank/core.h
+++ b/trunk/arch/arm/mach-highbank/core.h
@@ -1,5 +1,6 @@
 extern void highbank_set_cpu_jump(int cpu, void *jump_addr);
 extern void highbank_clocks_init(void);
+extern void highbank_restart(char, const char *);
 extern void __iomem *scu_base_addr;
 #ifdef CONFIG_DEBUG_HIGHBANK_UART
 extern void highbank_lluart_map_io(void);
diff --git a/trunk/arch/arm/mach-highbank/highbank.c b/trunk/arch/arm/mach-highbank/highbank.c
index 88660d500f5b..4508384f100f 100644
--- a/trunk/arch/arm/mach-highbank/highbank.c
+++ b/trunk/arch/arm/mach-highbank/highbank.c
@@ -146,4 +146,5 @@ DT_MACHINE_START(HIGHBANK, "Highbank")
 	.timer		= &highbank_timer,
 	.init_machine	= highbank_init,
 	.dt_compat	= highbank_match,
+	.restart	= highbank_restart,
 MACHINE_END
diff --git a/trunk/arch/arm/mach-highbank/include/mach/system.h b/trunk/arch/arm/mach-highbank/include/mach/system.h
index 7e8192296cae..0754c79114b0 100644
--- a/trunk/arch/arm/mach-highbank/include/mach/system.h
+++ b/trunk/arch/arm/mach-highbank/include/mach/system.h
@@ -21,6 +21,8 @@ static inline void arch_idle(void)
 	cpu_do_idle();
 }
 
-extern void arch_reset(char mode, const char *cmd);
+static inline void arch_reset(char mode, const char *cmd)
+{
+}
 
 #endif
diff --git a/trunk/arch/arm/mach-highbank/system.c b/trunk/arch/arm/mach-highbank/system.c
index 53f0c4c5ef1c..82c27230d4a9 100644
--- a/trunk/arch/arm/mach-highbank/system.c
+++ b/trunk/arch/arm/mach-highbank/system.c
@@ -20,7 +20,7 @@
 #include "core.h"
 #include "sysregs.h"
 
-void arch_reset(char mode, const char *cmd)
+void highbank_restart(char mode, const char *cmd)
 {
 	if (mode == 'h')
 		hignbank_set_pwr_hard_reset();