diff options
| author | Nicolas Pitre <nico@fluxnic.net> | 2010-02-05 00:20:24 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2010-02-05 00:27:07 -0500 |
| commit | 1961528959aa523a351b49236f8627b30793ee80 (patch) | |
| tree | f415aa1245e98cd6573a6ecd3336874fb47e0c1b /arch/arm/mach-orion5x | |
| parent | 2d18638ec010a2ed1daa08b4774ed12108647a53 (diff) | |
| download | linux-1961528959aa523a351b49236f8627b30793ee80.tar.gz linux-1961528959aa523a351b49236f8627b30793ee80.tar.bz2 linux-1961528959aa523a351b49236f8627b30793ee80.zip | |
[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')
| -rw-r--r-- | arch/arm/mach-orion5x/ls_hgl-setup.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-orion5x/lsmini-setup.c | 8 |
2 files changed, 8 insertions, 8 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 @@ #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); } diff --git a/arch/arm/mach-orion5x/lsmini-setup.c b/arch/arm/mach-orion5x/lsmini-setup.c index c9bf6b81a80d..c704f056de1e 100644 --- a/arch/arm/mach-orion5x/lsmini-setup.c +++ b/arch/arm/mach-orion5x/lsmini-setup.c @@ -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); } |