diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-30 19:38:04 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-30 19:38:04 +0200 |
| commit | 2e6713c7662cc5ebc7346b033c404cb2f708fd51 (patch) | |
| tree | 8492ea548fea2d8243e4af4b877906afc4e32783 /drivers/serial | |
| parent | Merge branch 'master' into for-linus (diff) | |
| parent | Merge branch 'i2c-fixes-rc4' of git://aeryn.fluff.org.uk/bjdooks/linux (diff) | |
| download | linux-2e6713c7662cc5ebc7346b033c404cb2f708fd51.tar.xz linux-2e6713c7662cc5ebc7346b033c404cb2f708fd51.zip | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/serial')
| -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) if (ret) goto err_add_port; +#ifdef CONFIG_SERIAL_ATMEL_CONSOLE if (atmel_is_console_port(&port->uart) && ATMEL_CONSOLE_DEVICE->flags & CON_ENABLED) { /* @@ -1559,6 +1560,7 @@ static int __devinit atmel_serial_probe(struct platform_device *pdev) */ clk_disable(port->clk); } +#endif device_init_wakeup(&pdev->dev, 1); platform_set_drvdata(pdev, port); |