aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv210/include/mach
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2011-10-04 18:57:43 +0900
committerKukjin Kim <kgene.kim@samsung.com>2011-10-04 18:57:43 +0900
commit22be71ea8bf7e9f907e916bf9f6c2bbea9f42553 (patch)
treeedf517ccf09aec82c6a30e69ef885a785fa77167 /arch/arm/mach-s5pv210/include/mach
parent59ca37f74a6e9d3e9367359f2fcbb286df7d9748 (diff)
parentb391f8cf606679e97b02e3b9dca8a1d9956a5301 (diff)
downloadkernel_samsung_smdk4412-22be71ea8bf7e9f907e916bf9f6c2bbea9f42553.zip
kernel_samsung_smdk4412-22be71ea8bf7e9f907e916bf9f6c2bbea9f42553.tar.gz
kernel_samsung_smdk4412-22be71ea8bf7e9f907e916bf9f6c2bbea9f42553.tar.bz2
Merge branch 'next/topic-gpio-samsung' into next-samsung-devel
Diffstat (limited to 'arch/arm/mach-s5pv210/include/mach')
-rw-r--r--arch/arm/mach-s5pv210/include/mach/pm-core.h2
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 3e22109..eba8aea 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,
}
static inline void s3c_pm_restored_gpios(void) { }
-static inline void s3c_pm_saved_gpios(void) { }
+static inline void samsung_pm_saved_gpios(void) { }