diff options
Diffstat (limited to 'drivers/serial/atmel_serial.c')
| -rw-r--r-- | drivers/serial/atmel_serial.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c index 338b15c0a548..607d43a31048 100644 --- a/drivers/serial/atmel_serial.c +++ b/drivers/serial/atmel_serial.c | |||
| @@ -1551,6 +1551,7 @@ static int __devinit atmel_serial_probe(struct platform_device *pdev) | |||
| 1551 | if (ret) | 1551 | if (ret) |
| 1552 | goto err_add_port; | 1552 | goto err_add_port; |
| 1553 | 1553 | ||
| 1554 | #ifdef CONFIG_SERIAL_ATMEL_CONSOLE | ||
| 1554 | if (atmel_is_console_port(&port->uart) | 1555 | if (atmel_is_console_port(&port->uart) |
| 1555 | && ATMEL_CONSOLE_DEVICE->flags & CON_ENABLED) { | 1556 | && ATMEL_CONSOLE_DEVICE->flags & CON_ENABLED) { |
| 1556 | /* | 1557 | /* |
| @@ -1559,6 +1560,7 @@ static int __devinit atmel_serial_probe(struct platform_device *pdev) | |||
| 1559 | */ | 1560 | */ |
| 1560 | clk_disable(port->clk); | 1561 | clk_disable(port->clk); |
| 1561 | } | 1562 | } |
| 1563 | #endif | ||
| 1562 | 1564 | ||
| 1563 | device_init_wakeup(&pdev->dev, 1); | 1565 | device_init_wakeup(&pdev->dev, 1); |
| 1564 | platform_set_drvdata(pdev, port); | 1566 | platform_set_drvdata(pdev, port); |
