diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-27 06:30:31 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-27 06:30:31 -0400 |
| commit | b0df89868006517417251e02cc4ce5d4b0165885 (patch) | |
| tree | 6800388c633a13f64fd1f7845ce026ca2606522f /arch/arm/mach-mxs/pm.c | |
| parent | 4ba21e868f4b6e2ce5432055e206edadc6319533 (diff) | |
| parent | 6c634726352f0d796a4b5e6aa9849ee5b45712ce (diff) | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/Kconfig.debug
arch/arm/plat-versatile/Kconfig
Merge fixes:
arch/arm/mach-integrator/Kconfig
drivers/clocksource/Kconfig
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: |