Merge branch 'amd-iommu/2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu

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);