summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/pm.h
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-03-10 18:10:21 +0100
committerOlof Johansson <olof@lixom.net>2012-03-10 18:10:21 +0100
commit86ca5b6fef2bf1aa77a62f29d844400e4fed8dde (patch)
tree22297e3d959eebb013644fb8fe6be5fdf6819590 /arch/arm/mach-omap2/pm.h
parentMerge branch 'cleanup-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/tm... (diff)
parentMerge branch 'for_3.4/cleanup/uart' of git://git.kernel.org/pub/scm/linux/ker... (diff)
downloadlinux-86ca5b6fef2bf1aa77a62f29d844400e4fed8dde.tar.xz
linux-86ca5b6fef2bf1aa77a62f29d844400e4fed8dde.zip
Merge branch 'uart' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
* 'uart' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: remove some orphan function declarations. ARM: OMAP2+: UART: remove unused fields in omap_uart_state.
Diffstat (limited to 'arch/arm/mach-omap2/pm.h')
-rw-r--r--arch/arm/mach-omap2/pm.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h
index a0514310d15f..36fa90b6ece8 100644
--- a/arch/arm/mach-omap2/pm.h
+++ b/arch/arm/mach-omap2/pm.h
@@ -18,7 +18,6 @@
extern void *omap3_secure_ram_storage;
extern void omap3_pm_off_mode_enable(int);
extern void omap_sram_idle(void);
-extern int omap3_can_sleep(void);
extern int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state);
extern int omap3_idle_init(void);
extern int omap4_idle_init(void);