git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
pm.h
diff --git
a/arch/arm/mach-omap2/pm.h
b/arch/arm/mach-omap2/pm.h
index
39580e6
..
797bfd1
100644
(file)
--- a/
arch/arm/mach-omap2/pm.h
+++ b/
arch/arm/mach-omap2/pm.h
@@
-127,6
+127,7
@@
static inline void omap_enable_smartreflex_on_init(void) {}
#ifdef CONFIG_TWL4030_CORE
extern int omap3_twl_init(void);
extern int omap4_twl_init(void);
#ifdef CONFIG_TWL4030_CORE
extern int omap3_twl_init(void);
extern int omap4_twl_init(void);
+extern int omap3_twl_set_sr_bit(bool enable);
#else
static inline int omap3_twl_init(void)
{
#else
static inline int omap3_twl_init(void)
{