From 0641e99e9aa9fdf9c8342ac7c8eff455fb26b310 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Sun, 19 Feb 2012 13:29:31 +1100 Subject: [PATCH] --- yaml --- r: 295715 b: refs/heads/master c: 7cb034f8179dfc2889c1f2341566ee68f648a324 h: refs/heads/master i: 295713: 7b2463db8db2561961e0a134172a18334ff131d8 295711: 6f9885cfed46ebbdcf341dfba60264276c228731 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/pm.h | 1 - trunk/arch/arm/plat-omap/include/plat/serial.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7da99e7782aa..a1a072191b97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 867e9f8d105004de85335414ab09e99338617e03 +refs/heads/master: 7cb034f8179dfc2889c1f2341566ee68f648a324 diff --git a/trunk/arch/arm/mach-omap2/pm.h b/trunk/arch/arm/mach-omap2/pm.h index b737b11e4499..6cd954dd189f 100644 --- a/trunk/arch/arm/mach-omap2/pm.h +++ b/trunk/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); diff --git a/trunk/arch/arm/plat-omap/include/plat/serial.h b/trunk/arch/arm/plat-omap/include/plat/serial.h index 198d1e6a4a6c..b073e5f2b190 100644 --- a/trunk/arch/arm/plat-omap/include/plat/serial.h +++ b/trunk/arch/arm/plat-omap/include/plat/serial.h @@ -110,7 +110,6 @@ struct omap_board_data; struct omap_uart_port_info; extern void omap_serial_init(void); -extern int omap_uart_can_sleep(void); extern void omap_serial_board_init(struct omap_uart_port_info *platform_data); extern void omap_serial_init_port(struct omap_board_data *bdata, struct omap_uart_port_info *platform_data);