Merge branch 'linus' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3

2012-11-09 14:58:01 -08:00
parent 6ba54ab4a4 3d70f8c617
commit edf8dde393
626 changed files with 7802 additions and 5035 deletions
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -330,6 +330,11 @@ void __init omap_serial_init_port(struct omap_board_data *bdata,

 	oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt);

+	if (console_uart_id == bdata->id) {
+		omap_device_enable(pdev);
+		pm_runtime_set_active(&pdev->dev);
+	}
+
 	oh->dev_attr = uart;

 	if (((cpu_is_omap34xx() || cpu_is_omap44xx()) && bdata->pads)