Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / drivers / w1 / masters / mxc_w1.c

diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
index b9d74d0b353ec438c3afd0a79c24fd6e6cfe8538..65244c02551b404963ac5480b96e1bfb2f9356a0 100644 (file)
--- a/drivers/w1/masters/mxc_w1.c
+++ b/drivers/w1/masters/mxc_w1.c
@@ -116,7 +116,7 @@ static int __init mxc_w1_probe(struct platform_device *pdev)
        if (!mdev)
                return -ENOMEM;
 
-       mdev->clk = clk_get(&pdev->dev, "owire_clk");
+       mdev->clk = clk_get(&pdev->dev, "owire");
        if (!mdev->clk) {
                err = -ENODEV;
                goto failed_clk;