tracing/kprobes: Add probe handler dispatcher to support perf and ftrace concurrent use

[~andy/linux] / drivers / serial / atmel_serial.c

diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index 338b15c0a548e9f2d6d630d1ea3eb52954abff0a..607d43a31048d8a7f7c5c479d85c80848d0b2e3a 100644 (file)
--- 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);