summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/include/mach/pm.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-11-27 11:13:10 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-11-27 11:13:10 +0000
commit6417a917b564106dcf2b8f42687f92ad94635ddd (patch)
tree8d90c781bb376169f92cbe98a1fb3543b361258d /arch/arm/plat-omap/include/mach/pm.h
parent47fd6f7c94e15eb5f97dd1cbb0427a46b03c8185 (diff)
parent723fdb781abfe78d8ba7d911abbb581722348aa7 (diff)
downloadop-kernel-dev-6417a917b564106dcf2b8f42687f92ad94635ddd.zip
op-kernel-dev-6417a917b564106dcf2b8f42687f92ad94635ddd.tar.gz
Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'arch/arm/plat-omap/include/mach/pm.h')
-rw-r--r--arch/arm/plat-omap/include/mach/pm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/mach/pm.h b/arch/arm/plat-omap/include/mach/pm.h
index 768eb6e..2a9c27a 100644
--- a/arch/arm/plat-omap/include/mach/pm.h
+++ b/arch/arm/plat-omap/include/mach/pm.h
@@ -128,7 +128,7 @@ void clk_deny_idle(struct clk *clk);
* clk_allow_idle - Counters previous clk_deny_idle
* @clk: clock signal handle
*/
-void clk_deny_idle(struct clk *clk);
+void clk_allow_idle(struct clk *clk);
extern void omap_pm_idle(void);
extern void omap_pm_suspend(void);
OpenPOWER on IntegriCloud