diff options
-rw-r--r-- | arch/arm/mach-omap2/pm.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap2/serial.c | 4 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/serial.h | 1 |
3 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h index b737b11e4499..6cd954dd189f 100644 --- a/arch/arm/mach-omap2/pm.h +++ b/arch/arm/mach-omap2/pm.h | |||
@@ -18,7 +18,6 @@ | |||
18 | extern void *omap3_secure_ram_storage; | 18 | extern void *omap3_secure_ram_storage; |
19 | extern void omap3_pm_off_mode_enable(int); | 19 | extern void omap3_pm_off_mode_enable(int); |
20 | extern void omap_sram_idle(void); | 20 | extern void omap_sram_idle(void); |
21 | extern int omap3_can_sleep(void); | ||
22 | extern int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state); | 21 | extern int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state); |
23 | extern int omap3_idle_init(void); | 22 | extern int omap3_idle_init(void); |
24 | extern int omap4_idle_init(void); | 23 | extern int omap4_idle_init(void); |
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index f590afc1f673..0cdd359a128e 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c | |||
@@ -54,11 +54,9 @@ | |||
54 | 54 | ||
55 | struct omap_uart_state { | 55 | struct omap_uart_state { |
56 | int num; | 56 | int num; |
57 | int can_sleep; | ||
58 | 57 | ||
59 | struct list_head node; | 58 | struct list_head node; |
60 | struct omap_hwmod *oh; | 59 | struct omap_hwmod *oh; |
61 | struct platform_device *pdev; | ||
62 | }; | 60 | }; |
63 | 61 | ||
64 | static LIST_HEAD(uart_list); | 62 | static LIST_HEAD(uart_list); |
@@ -381,8 +379,6 @@ void __init omap_serial_init_port(struct omap_board_data *bdata, | |||
381 | 379 | ||
382 | oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt); | 380 | oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt); |
383 | 381 | ||
384 | uart->pdev = pdev; | ||
385 | |||
386 | oh->dev_attr = uart; | 382 | oh->dev_attr = uart; |
387 | 383 | ||
388 | if (((cpu_is_omap34xx() || cpu_is_omap44xx()) && bdata->pads) | 384 | if (((cpu_is_omap34xx() || cpu_is_omap44xx()) && bdata->pads) |
diff --git a/arch/arm/plat-omap/include/plat/serial.h b/arch/arm/plat-omap/include/plat/serial.h index 198d1e6a4a6c..b073e5f2b190 100644 --- a/arch/arm/plat-omap/include/plat/serial.h +++ b/arch/arm/plat-omap/include/plat/serial.h | |||
@@ -110,7 +110,6 @@ struct omap_board_data; | |||
110 | struct omap_uart_port_info; | 110 | struct omap_uart_port_info; |
111 | 111 | ||
112 | extern void omap_serial_init(void); | 112 | extern void omap_serial_init(void); |
113 | extern int omap_uart_can_sleep(void); | ||
114 | extern void omap_serial_board_init(struct omap_uart_port_info *platform_data); | 113 | extern void omap_serial_board_init(struct omap_uart_port_info *platform_data); |
115 | extern void omap_serial_init_port(struct omap_board_data *bdata, | 114 | extern void omap_serial_init_port(struct omap_board_data *bdata, |
116 | struct omap_uart_port_info *platform_data); | 115 | struct omap_uart_port_info *platform_data); |