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-s5pv210/include | |
| parent | 59ca37f74a6e9d3e9367359f2fcbb286df7d9748 (diff) | |
| parent | b391f8cf606679e97b02e3b9dca8a1d9956a5301 (diff) | |
Merge branch 'next/topic-gpio-samsung' into next-samsung-devel
Diffstat (limited to 'arch/arm/mach-s5pv210/include')
| -rw-r--r-- | arch/arm/mach-s5pv210/include/mach/pm-core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv210/include/mach/pm-core.h b/arch/arm/mach-s5pv210/include/mach/pm-core.h index 3e22109e1b7b..eba8aea63ed8 100644 --- a/arch/arm/mach-s5pv210/include/mach/pm-core.h +++ b/arch/arm/mach-s5pv210/include/mach/pm-core.h | |||
| @@ -43,4 +43,4 @@ static inline void s3c_pm_arch_update_uart(void __iomem *regs, | |||
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | static inline void s3c_pm_restored_gpios(void) { } | 45 | static inline void s3c_pm_restored_gpios(void) { } |
| 46 | static inline void s3c_pm_saved_gpios(void) { } | 46 | static inline void samsung_pm_saved_gpios(void) { } |