aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion5x/ls_hgl-setup.c
diff options
context:
space:
mode:
authorNicolas Pitre <nico@fluxnic.net>2010-02-05 00:20:24 -0500
committerNicolas Pitre <nico@fluxnic.net>2010-02-05 00:27:07 -0500
commit1961528959aa523a351b49236f8627b30793ee80 (patch)
treef415aa1245e98cd6573a6ecd3336874fb47e0c1b /arch/arm/mach-orion5x/ls_hgl-setup.c
parent2d18638ec010a2ed1daa08b4774ed12108647a53 (diff)
[ARM] orion5x: fix some improper includes in Linkstation files
... and replace misuse of arch_reset() with arm_machine_restart(). Signed-off-by: Nicolas Pitre <nico@marvell.com>
Diffstat (limited to 'arch/arm/mach-orion5x/ls_hgl-setup.c')
-rw-r--r--arch/arm/mach-orion5x/ls_hgl-setup.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-orion5x/ls_hgl-setup.c b/arch/arm/mach-orion5x/ls_hgl-setup.c
index b9acd6bb382b..8e569be6e2c7 100644
--- a/arch/arm/mach-orion5x/ls_hgl-setup.c
+++ b/arch/arm/mach-orion5x/ls_hgl-setup.c
@@ -11,7 +11,6 @@
11#include <linux/kernel.h> 11#include <linux/kernel.h>
12#include <linux/init.h> 12#include <linux/init.h>
13#include <linux/platform_device.h> 13#include <linux/platform_device.h>
14#include <linux/pci.h>
15#include <linux/mtd/physmap.h> 14#include <linux/mtd/physmap.h>
16#include <linux/mv643xx_eth.h> 15#include <linux/mv643xx_eth.h>
17#include <linux/leds.h> 16#include <linux/leds.h>
@@ -19,12 +18,13 @@
19#include <linux/input.h> 18#include <linux/input.h>
20#include <linux/i2c.h> 19#include <linux/i2c.h>
21#include <linux/ata_platform.h> 20#include <linux/ata_platform.h>
22#include <asm/mach-types.h>
23#include <linux/gpio.h> 21#include <linux/gpio.h>
22#include <asm/mach-types.h>
24#include <asm/mach/arch.h> 23#include <asm/mach/arch.h>
24#include <asm/system.h>
25#include <mach/orion5x.h>
25#include "common.h" 26#include "common.h"
26#include "mpp.h" 27#include "mpp.h"
27#include "include/mach/system.h"
28 28
29/***************************************************************************** 29/*****************************************************************************
30 * Linkstation LS-HGL Info 30 * Linkstation LS-HGL Info
@@ -186,7 +186,7 @@ static struct mv_sata_platform_data ls_hgl_sata_data = {
186 186
187static void ls_hgl_power_off(void) 187static void ls_hgl_power_off(void)
188{ 188{
189 arch_reset(0, NULL); 189 arm_machine_restart('h', NULL);
190} 190}
191 191
192 192