diff options
author | Olof Johansson <olof@lixom.net> | 2012-03-10 09:10:21 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-03-10 09:10:21 -0800 |
commit | 86ca5b6fef2bf1aa77a62f29d844400e4fed8dde (patch) | |
tree | 22297e3d959eebb013644fb8fe6be5fdf6819590 /arch/arm/mach-omap2/pm.h | |
parent | e65bc8918f75620f1668d321b048bfa336ccc0fa (diff) | |
parent | dd713e97f7e08b5742d9252f404cde34b97e1587 (diff) | |
download | op-kernel-dev-86ca5b6fef2bf1aa77a62f29d844400e4fed8dde.zip op-kernel-dev-86ca5b6fef2bf1aa77a62f29d844400e4fed8dde.tar.gz |
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.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h index a051431..36fa90b 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); |