aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/serial.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 8396b5b7e912..25fb6e9fda5c 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -63,7 +63,6 @@ struct omap_uart_state {
63static LIST_HEAD(uart_list); 63static LIST_HEAD(uart_list);
64static u8 num_uarts; 64static u8 num_uarts;
65static u8 console_uart_id = -1; 65static u8 console_uart_id = -1;
66static u8 no_console_suspend;
67static u8 uart_debug; 66static u8 uart_debug;
68 67
69#define DEFAULT_RXDMA_POLLRATE 1 /* RX DMA polling rate (us) */ 68#define DEFAULT_RXDMA_POLLRATE 1 /* RX DMA polling rate (us) */
@@ -236,9 +235,6 @@ static int __init omap_serial_early_init(void)
236 uart_name, uart->num); 235 uart_name, uart->num);
237 } 236 }
238 237
239 if (cmdline_find_option("no_console_suspend"))
240 no_console_suspend = true;
241
242 /* 238 /*
243 * omap-uart can be used for earlyprintk logs 239 * omap-uart can be used for earlyprintk logs
244 * So if omap-uart is used as console then prevent 240 * So if omap-uart is used as console then prevent
@@ -323,9 +319,6 @@ void __init omap_serial_init_port(struct omap_board_data *bdata,
323 return; 319 return;
324 } 320 }
325 321
326 if ((console_uart_id == bdata->id) && no_console_suspend)
327 omap_device_disable_idle_on_suspend(pdev);
328
329 oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt); 322 oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt);
330 323
331 if (console_uart_id == bdata->id) { 324 if (console_uart_id == bdata->id) {