Merge branch 'next-samsung-devel' into next-samsung-devel-2

[deliverable/linux.git] / arch / arm / mach-s5pv210 / include / mach / pm-core.h

diff --git a/arch/arm/mach-s5pv210/include/mach/pm-core.h b/arch/arm/mach-s5pv210/include/mach/pm-core.h
index 3e22109e1b7b4e851f890cb19cffd4d49c89314e..eba8aea63ed8f928b09f9d56a8486d666e31e302 100644 (file)
--- 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) { }