Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev

[mv-sheeva.git] / drivers / serial / imx.c

diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index a50954612b60145e7f9eb6acc12d9f05fb8b05d8..9f460b175c50ba9eaff00a10ebdbec1f77f21f84 100644 (file)
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -1129,7 +1129,7 @@ static int serial_imx_probe(struct platform_device *pdev)
        sport->timer.function = imx_timeout;
        sport->timer.data     = (unsigned long)sport;
 
-       sport->clk = clk_get(&pdev->dev, "uart_clk");
+       sport->clk = clk_get(&pdev->dev, "uart");
        if (IS_ERR(sport->clk)) {
                ret = PTR_ERR(sport->clk);
                goto unmap;