From c5655c376093ccdc5758e6c277e5f9febf32cc40 Mon Sep 17 00:00:00 2001
From: Albin Tonnerre <albin.tonnerre@gmail.com>
Date: Wed, 29 Jul 2009 15:04:18 -0700
Subject: [PATCH] --- yaml --- r: 156055 b: refs/heads/master c:
 8da14b5fc32368f582df09fe9c0bec2507868583 h: refs/heads/master i:   156053:
 25f56291211b009e19c0cb5b3ce1a68dc9ca5252   156051:
 a4ddb22dc5b4b35e7e9f111a1486a018d685a6ee   156047:
 713f8c381a22f03525161edd004e632bcf3b101b v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/serial/atmel_serial.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8a6cfb370120..ae9a2c8655d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 534acc057b5a08ec33fa57cdd2f5a09ef124e7f2
+refs/heads/master: 8da14b5fc32368f582df09fe9c0bec2507868583
diff --git a/trunk/drivers/serial/atmel_serial.c b/trunk/drivers/serial/atmel_serial.c
index 338b15c0a548..607d43a31048 100644
--- a/trunk/drivers/serial/atmel_serial.c
+++ b/trunk/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);