Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[karo-tx-linux.git] / arch / arm / plat-samsung / include / plat / pm.h

diff --git a/arch/arm/plat-samsung/include/plat/pm.h b/arch/arm/plat-samsung/include/plat/pm.h
index 78014e53eb3cc720744346a4e70d95212991aeda..61fc53740fbd8811a8d06659806ecfc6e5cc8c77 100644 (file)
--- a/arch/arm/plat-samsung/include/plat/pm.h
+++ b/arch/arm/plat-samsung/include/plat/pm.h
@@ -22,6 +22,7 @@ struct device;
 #ifdef CONFIG_PM
 
 extern __init int s3c_pm_init(void);
+extern __init int s3c64xx_pm_init(void);
 
 #else
 
@@ -29,6 +30,11 @@ static inline int s3c_pm_init(void)
 {
        return 0;
 }
+
+static inline int s3c64xx_pm_init(void)
+{
+       return 0;
+}
 #endif
 
 /* configuration for the IRQ mask over sleep */