projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[profile/ivi/kernel-x86-ivi.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
78014e5
..
61fc537
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);
#ifdef CONFIG_PM
extern __init int s3c_pm_init(void);
+extern __init int s3c64xx_pm_init(void);
#else
#else
@@
-29,6
+30,11
@@
static inline int s3c_pm_init(void)
{
return 0;
}
{
return 0;
}
+
+static inline int s3c64xx_pm_init(void)
+{
+ return 0;
+}
#endif
/* configuration for the IRQ mask over sleep */
#endif
/* configuration for the IRQ mask over sleep */