diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-23 06:59:04 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-23 06:59:13 -0500 |
| commit | 34e5f4f198ddd36a82dc12164de7fc4f5430e09d (patch) | |
| tree | 70a06002170ddc2a859f877564834177f0f3df5d /arch/arm/mach-imx/pm-imx27.c | |
| parent | e76f4750f4c06c8b891ae7bc4c10074de08a9d41 (diff) | |
| parent | a570067df9cc1b1821ca5255bbbe8adb67aca199 (diff) | |
Merge branches 'debug' and 'idle' into for-armsoc
Diffstat (limited to 'arch/arm/mach-imx/pm-imx27.c')
| -rw-r--r-- | arch/arm/mach-imx/pm-imx27.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/pm-imx27.c b/arch/arm/mach-imx/pm-imx27.c index e455d2f855bf..6fcffa7db978 100644 --- a/arch/arm/mach-imx/pm-imx27.c +++ b/arch/arm/mach-imx/pm-imx27.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 11 | #include <linux/suspend.h> | 11 | #include <linux/suspend.h> |
| 12 | #include <linux/io.h> | 12 | #include <linux/io.h> |
| 13 | #include <mach/system.h> | ||
| 14 | #include <mach/hardware.h> | 13 | #include <mach/hardware.h> |
| 15 | 14 | ||
| 16 | static int mx27_suspend_enter(suspend_state_t state) | 15 | static int mx27_suspend_enter(suspend_state_t state) |
| @@ -23,7 +22,7 @@ static int mx27_suspend_enter(suspend_state_t state) | |||
| 23 | cscr &= 0xFFFFFFFC; | 22 | cscr &= 0xFFFFFFFC; |
| 24 | __raw_writel(cscr, MX27_IO_ADDRESS(MX27_CCM_BASE_ADDR)); | 23 | __raw_writel(cscr, MX27_IO_ADDRESS(MX27_CCM_BASE_ADDR)); |
| 25 | /* Executes WFI */ | 24 | /* Executes WFI */ |
| 26 | arch_idle(); | 25 | cpu_do_idle(); |
| 27 | break; | 26 | break; |
| 28 | 27 | ||
| 29 | default: | 28 | default: |