diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 05:57:43 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 05:57:43 -0400 |
| commit | 22be71ea8bf7e9f907e916bf9f6c2bbea9f42553 (patch) | |
| tree | edf517ccf09aec82c6a30e69ef885a785fa77167 /arch/arm/plat-samsung/pm.c | |
| parent | 59ca37f74a6e9d3e9367359f2fcbb286df7d9748 (diff) | |
| parent | b391f8cf606679e97b02e3b9dca8a1d9956a5301 (diff) | |
Merge branch 'next/topic-gpio-samsung' into next-samsung-devel
Diffstat (limited to 'arch/arm/plat-samsung/pm.c')
| -rw-r--r-- | arch/arm/plat-samsung/pm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-samsung/pm.c b/arch/arm/plat-samsung/pm.c index ae6f99834cdd..64ab65f0fdbc 100644 --- a/arch/arm/plat-samsung/pm.c +++ b/arch/arm/plat-samsung/pm.c | |||
| @@ -268,8 +268,8 @@ static int s3c_pm_enter(suspend_state_t state) | |||
| 268 | 268 | ||
| 269 | /* save all necessary core registers not covered by the drivers */ | 269 | /* save all necessary core registers not covered by the drivers */ |
| 270 | 270 | ||
| 271 | s3c_pm_save_gpios(); | 271 | samsung_pm_save_gpios(); |
| 272 | s3c_pm_saved_gpios(); | 272 | samsung_pm_saved_gpios(); |
| 273 | s3c_pm_save_uarts(); | 273 | s3c_pm_save_uarts(); |
| 274 | s3c_pm_save_core(); | 274 | s3c_pm_save_core(); |
| 275 | 275 | ||
| @@ -306,7 +306,7 @@ static int s3c_pm_enter(suspend_state_t state) | |||
| 306 | 306 | ||
| 307 | s3c_pm_restore_core(); | 307 | s3c_pm_restore_core(); |
| 308 | s3c_pm_restore_uarts(); | 308 | s3c_pm_restore_uarts(); |
| 309 | s3c_pm_restore_gpios(); | 309 | samsung_pm_restore_gpios(); |
| 310 | s3c_pm_restored_gpios(); | 310 | s3c_pm_restored_gpios(); |
| 311 | 311 | ||
| 312 | s3c_pm_debug_init(); | 312 | s3c_pm_debug_init(); |