diff options
Diffstat (limited to 'arch/arm/mach-pxa/zeus.c')
-rw-r--r-- | arch/arm/mach-pxa/zeus.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c index 00363c7ac18..99c49bcd9f7 100644 --- a/arch/arm/mach-pxa/zeus.c +++ b/arch/arm/mach-pxa/zeus.c | |||
@@ -31,17 +31,17 @@ | |||
31 | #include <linux/can/platform/mcp251x.h> | 31 | #include <linux/can/platform/mcp251x.h> |
32 | 32 | ||
33 | #include <asm/mach-types.h> | 33 | #include <asm/mach-types.h> |
34 | #include <asm/suspend.h> | ||
34 | #include <asm/mach/arch.h> | 35 | #include <asm/mach/arch.h> |
35 | #include <asm/mach/map.h> | 36 | #include <asm/mach/map.h> |
36 | 37 | ||
37 | #include <mach/pxa2xx-regs.h> | 38 | #include <mach/pxa27x.h> |
38 | #include <mach/regs-uart.h> | 39 | #include <mach/regs-uart.h> |
39 | #include <mach/ohci.h> | 40 | #include <mach/ohci.h> |
40 | #include <mach/mmc.h> | 41 | #include <mach/mmc.h> |
41 | #include <mach/pxa27x-udc.h> | 42 | #include <mach/pxa27x-udc.h> |
42 | #include <mach/udc.h> | 43 | #include <mach/udc.h> |
43 | #include <mach/pxafb.h> | 44 | #include <mach/pxafb.h> |
44 | #include <mach/mfp-pxa27x.h> | ||
45 | #include <mach/pm.h> | 45 | #include <mach/pm.h> |
46 | #include <mach/audio.h> | 46 | #include <mach/audio.h> |
47 | #include <mach/arcom-pcmcia.h> | 47 | #include <mach/arcom-pcmcia.h> |
@@ -676,7 +676,7 @@ static struct pxa2xx_udc_mach_info zeus_udc_info = { | |||
676 | static void zeus_power_off(void) | 676 | static void zeus_power_off(void) |
677 | { | 677 | { |
678 | local_irq_disable(); | 678 | local_irq_disable(); |
679 | pxa27x_cpu_suspend(PWRMODE_DEEPSLEEP, PLAT_PHYS_OFFSET - PAGE_OFFSET); | 679 | cpu_suspend(PWRMODE_DEEPSLEEP, pxa27x_finish_suspend); |
680 | } | 680 | } |
681 | #else | 681 | #else |
682 | #define zeus_power_off NULL | 682 | #define zeus_power_off NULL |
@@ -908,6 +908,7 @@ MACHINE_START(ARCOM_ZEUS, "Arcom/Eurotech ZEUS") | |||
908 | .map_io = zeus_map_io, | 908 | .map_io = zeus_map_io, |
909 | .nr_irqs = ZEUS_NR_IRQS, | 909 | .nr_irqs = ZEUS_NR_IRQS, |
910 | .init_irq = zeus_init_irq, | 910 | .init_irq = zeus_init_irq, |
911 | .handle_irq = pxa27x_handle_irq, | ||
911 | .timer = &pxa_timer, | 912 | .timer = &pxa_timer, |
912 | .init_machine = zeus_init, | 913 | .init_machine = zeus_init, |
913 | MACHINE_END | 914 | MACHINE_END |