diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 11:57:43 +0200 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 11:57:43 +0200 |
commit | 22be71ea8bf7e9f907e916bf9f6c2bbea9f42553 (patch) | |
tree | edf517ccf09aec82c6a30e69ef885a785fa77167 /arch/arm/mach-exynos4 | |
parent | Merge branch 'next/topic-dma-samsung' into next-samsung-devel (diff) | |
parent | gpio/samsung: correct pin configuration for S5PC100/S5PC110/EXYNOS4 (diff) | |
download | linux-22be71ea8bf7e9f907e916bf9f6c2bbea9f42553.tar.xz linux-22be71ea8bf7e9f907e916bf9f6c2bbea9f42553.zip |
Merge branch 'next/topic-gpio-samsung' into next-samsung-devel
Diffstat (limited to 'arch/arm/mach-exynos4')
-rw-r--r-- | arch/arm/mach-exynos4/include/mach/pm-core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos4/include/mach/pm-core.h b/arch/arm/mach-exynos4/include/mach/pm-core.h index 1df3b81f96e8..3499ec737206 100644 --- a/arch/arm/mach-exynos4/include/mach/pm-core.h +++ b/arch/arm/mach-exynos4/include/mach/pm-core.h @@ -53,7 +53,7 @@ static inline void s3c_pm_restored_gpios(void) /* nothing here yet */ } -static inline void s3c_pm_saved_gpios(void) +static inline void samsung_pm_saved_gpios(void) { /* nothing here yet */ } |