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

Commit 19615289 authored by Nicolas Pitre's avatar Nicolas Pitre
Browse files

[ARM] orion5x: fix some improper includes in Linkstation files 



... and replace misuse of arch_reset() with arm_machine_restart().

Signed-off-by: default avatarNicolas Pitre <nico@marvell.com>
parent 2d18638e

arch/arm/mach-orion5x/ls_hgl-setup.c

+4 −4
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/pci.h>

#include <linux/mtd/physmap.h>

#include <linux/mv643xx_eth.h>

#include <linux/leds.h>
@@ -19,12 +18,13 @@ 
#include <linux/input.h>

#include <linux/i2c.h>

#include <linux/ata_platform.h>

#include <asm/mach-types.h>

#include <linux/gpio.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/system.h>

#include <mach/orion5x.h>

#include "common.h"

#include "mpp.h"

#include "include/mach/system.h"



/*****************************************************************************

 * Linkstation LS-HGL Info
@@ -186,7 +186,7 @@ static struct mv_sata_platform_data ls_hgl_sata_data = { 


static void ls_hgl_power_off(void)

{

	arch_reset(0, NULL);

	arm_machine_restart('h', NULL);

}

arch/arm/mach-orion5x/lsmini-setup.c

+4 −4
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/pci.h>

#include <linux/mtd/physmap.h>

#include <linux/mv643xx_eth.h>

#include <linux/leds.h>
@@ -19,12 +18,13 @@ 
#include <linux/input.h>

#include <linux/i2c.h>

#include <linux/ata_platform.h>

#include <asm/mach-types.h>

#include <linux/gpio.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/system.h>

#include <mach/orion5x.h>

#include "common.h"

#include "mpp.h"

#include "include/mach/system.h"



/*****************************************************************************

 * Linkstation Mini Info
@@ -186,7 +186,7 @@ static struct mv_sata_platform_data lsmini_sata_data = { 


static void lsmini_power_off(void)

{

	arch_reset(0, NULL);

	arm_machine_restart('h', NULL);

}