UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Nicolas Pitre 2010-02-05 00:20:24 -05:00
parent 2d18638ec0
commit 1961528959
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-orion5x/ls_hgl-setup.c
View File

@ -11,7 +11,6 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pci.h>
#include <linux/mtd/physmap.h> #include <linux/mtd/physmap.h>
#include <linux/mv643xx_eth.h> #include <linux/mv643xx_eth.h>
#include <linux/leds.h> #include <linux/leds.h>
@ -19,12 +18,13 @@
#include <linux/input.h> #include <linux/input.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/ata_platform.h> #include <linux/ata_platform.h>
#include <asm/mach-types.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/system.h>
#include <mach/orion5x.h>
#include "common.h" #include "common.h"
#include "mpp.h" #include "mpp.h"
#include "include/mach/system.h"
/***************************************************************************** /*****************************************************************************
* Linkstation LS-HGL Info * 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) static void ls_hgl_power_off(void)
{ {
arch_reset(0, NULL); arm_machine_restart('h', NULL);
} }

8
arch/arm/mach-orion5x/lsmini-setup.c
View File

@ -11,7 +11,6 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pci.h>
#include <linux/mtd/physmap.h> #include <linux/mtd/physmap.h>
#include <linux/mv643xx_eth.h> #include <linux/mv643xx_eth.h>
#include <linux/leds.h> #include <linux/leds.h>
@ -19,12 +18,13 @@
#include <linux/input.h> #include <linux/input.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/ata_platform.h> #include <linux/ata_platform.h>
#include <asm/mach-types.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/system.h>
#include <mach/orion5x.h>
#include "common.h" #include "common.h"
#include "mpp.h" #include "mpp.h"
#include "include/mach/system.h"
/***************************************************************************** /*****************************************************************************
* Linkstation Mini Info * Linkstation Mini Info
@ -186,7 +186,7 @@ static struct mv_sata_platform_data lsmini_sata_data = {
static void lsmini_power_off(void) static void lsmini_power_off(void)
{ {
arch_reset(0, NULL); arm_machine_restart('h', NULL);
} }