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/mach-s3c64xx/include | |
| parent | 59ca37f74a6e9d3e9367359f2fcbb286df7d9748 (diff) | |
| parent | b391f8cf606679e97b02e3b9dca8a1d9956a5301 (diff) | |
Merge branch 'next/topic-gpio-samsung' into next-samsung-devel
Diffstat (limited to 'arch/arm/mach-s3c64xx/include')
| -rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/pm-core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/include/mach/pm-core.h b/arch/arm/mach-s3c64xx/include/mach/pm-core.h index 38659bebe4b1..fcf3dcabb694 100644 --- a/arch/arm/mach-s3c64xx/include/mach/pm-core.h +++ b/arch/arm/mach-s3c64xx/include/mach/pm-core.h | |||
| @@ -104,7 +104,7 @@ static inline void s3c_pm_restored_gpios(void) | |||
| 104 | __raw_writel(0, S3C64XX_SLPEN); | 104 | __raw_writel(0, S3C64XX_SLPEN); |
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | static inline void s3c_pm_saved_gpios(void) | 107 | static inline void samsung_pm_saved_gpios(void) |
| 108 | { | 108 | { |
| 109 | /* turn on the sleep mode and keep it there, as it seems that during | 109 | /* turn on the sleep mode and keep it there, as it seems that during |
| 110 | * suspend the xCON registers get re-set and thus you can end up with | 110 | * suspend the xCON registers get re-set and thus you can end up with |