diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-02-03 06:32:26 -0500 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-02-03 06:32:26 -0500 |
| commit | 57225b76864210d667b935c54babf22b6c31336b (patch) | |
| tree | cce7eab28de00a88d75b8eda704f5838e10947b1 /arch/arm/mach-mxs/pm.c | |
| parent | 62aa2b537c6f5957afd98e29f96897419ed5ebab (diff) | |
| parent | dcf81c1af839b77b44404453ecae6e5ac5a75f05 (diff) | |
Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base
Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9g45.c
Diffstat (limited to 'arch/arm/mach-mxs/pm.c')
| -rw-r--r-- | arch/arm/mach-mxs/pm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-mxs/pm.c b/arch/arm/mach-mxs/pm.c index fb042da29bda..a9b4bbcdafb4 100644 --- a/arch/arm/mach-mxs/pm.c +++ b/arch/arm/mach-mxs/pm.c | |||
| @@ -15,13 +15,12 @@ | |||
| 15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 16 | #include <linux/suspend.h> | 16 | #include <linux/suspend.h> |
| 17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
| 18 | #include <mach/system.h> | ||
| 19 | 18 | ||
| 20 | static int mxs_suspend_enter(suspend_state_t state) | 19 | static int mxs_suspend_enter(suspend_state_t state) |
| 21 | { | 20 | { |
| 22 | switch (state) { | 21 | switch (state) { |
| 23 | case PM_SUSPEND_MEM: | 22 | case PM_SUSPEND_MEM: |
| 24 | arch_idle(); | 23 | cpu_do_idle(); |
| 25 | break; | 24 | break; |
| 26 | 25 | ||
| 27 | default: | 26 | default: |