diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-03-06 16:37:49 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-03-06 16:37:49 -0800 |
| commit | dd713e97f7e08b5742d9252f404cde34b97e1587 (patch) | |
| tree | 96649970c8f2b52f274a7d80bfdaf1a7629e7890 | |
| parent | b01543dfe67bb1d191998e90d20534dc354de059 (diff) | |
| parent | 7cb034f8179dfc2889c1f2341566ee68f648a324 (diff) | |
| download | op-kernel-dev-dd713e97f7e08b5742d9252f404cde34b97e1587.zip op-kernel-dev-dd713e97f7e08b5742d9252f404cde34b97e1587.tar.gz | |
Merge branch 'for_3.4/cleanup/uart' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into uart
| -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 b737b11..6cd954d 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); diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index f590afc..0cdd359 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -54,11 +54,9 @@ struct omap_uart_state { int num; - int can_sleep; struct list_head node; struct omap_hwmod *oh; - struct platform_device *pdev; }; static LIST_HEAD(uart_list); @@ -381,8 +379,6 @@ void __init omap_serial_init_port(struct omap_board_data *bdata, oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt); - uart->pdev = pdev; - oh->dev_attr = uart; 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 198d1e6..b073e5f 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; 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); |
