From 1ef61e68ea54baca6bdf8759d523760d629872cb Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 5 Nov 2011 15:45:57 +0000
Subject: [PATCH] --- yaml --- r: 279975 b: refs/heads/master c:
 a1c1cee9adac4d2ab2d989cf83ada063cbd426d0 h: refs/heads/master i:   279973:
 ec4e97f6092f9647a8a6246d3fbbe22142e511a5   279971:
 cd3d4be695cceb03b178ab94c5d61bad49a394b7   279967:
 4935e7aae1cc9cb7e3d32e15c6c49509ef7ba111 v: v3

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

diff --git a/[refs] b/[refs]
index 738750c3a825..1d3dc683790f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 764cbcc2e3fa444c205b20b3d7908b06b60716ab
+refs/heads/master: a1c1cee9adac4d2ab2d989cf83ada063cbd426d0
diff --git a/trunk/arch/arm/mach-pnx4008/core.c b/trunk/arch/arm/mach-pnx4008/core.c
index cdb95e726f5c..4cfb40b2ec19 100644
--- a/trunk/arch/arm/mach-pnx4008/core.c
+++ b/trunk/arch/arm/mach-pnx4008/core.c
@@ -260,6 +260,11 @@ void __init pnx4008_map_io(void)
 	iotable_init(pnx4008_io_desc, ARRAY_SIZE(pnx4008_io_desc));
 }
 
+static void pnx4008_restart(char mode, const char *cmd)
+{
+	soft_restart(0);
+}
+
 extern struct sys_timer pnx4008_timer;
 
 MACHINE_START(PNX4008, "Philips PNX4008")
@@ -269,4 +274,5 @@ MACHINE_START(PNX4008, "Philips PNX4008")
 	.init_irq 		= pnx4008_init_irq,
 	.init_machine 		= pnx4008_init,
 	.timer 			= &pnx4008_timer,
+	.restart		= pnx4008_restart,
 MACHINE_END
diff --git a/trunk/arch/arm/mach-pnx4008/include/mach/system.h b/trunk/arch/arm/mach-pnx4008/include/mach/system.h
index 5d6384a6128c..6710ed347325 100644
--- a/trunk/arch/arm/mach-pnx4008/include/mach/system.h
+++ b/trunk/arch/arm/mach-pnx4008/include/mach/system.h
@@ -21,10 +21,6 @@
 #ifndef __ASM_ARCH_SYSTEM_H
 #define __ASM_ARCH_SYSTEM_H
 
-#include <linux/io.h>
-#include <mach/hardware.h>
-#include <mach/platform.h>
-
 static void arch_idle(void)
 {
 	cpu_do_idle();
@@ -32,7 +28,6 @@ static void arch_idle(void)
 
 static inline void arch_reset(char mode, const char *cmd)
 {
-	soft_restart(0);
 }
 
 #endif