---

yaml --- r: 156055 b: refs/heads/master c: 8da14b5 h: refs/heads/master i: 156053: 25f5629 156051: a4ddb22 156047: 713f8c3 v: v3
git-mirror · Jul 30, 2009 · c5655c3 · c5655c3
1 parent 9c5a706
commit c5655c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);