Merge branch 'x86/setup' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...
[linux-2.6] / drivers / w1 / masters / omap_hdq.c
index c973889..a7e3b70 100644 (file)
@@ -590,8 +590,8 @@ static int __init omap_hdq_probe(struct platform_device *pdev)
        }
 
        /* get interface & functional clock objects */
-       hdq_data->hdq_ick = clk_get(&pdev->dev, "hdq_ick");
-       hdq_data->hdq_fck = clk_get(&pdev->dev, "hdq_fck");
+       hdq_data->hdq_ick = clk_get(&pdev->dev, "ick");
+       hdq_data->hdq_fck = clk_get(&pdev->dev, "fck");
 
        if (IS_ERR(hdq_data->hdq_ick) || IS_ERR(hdq_data->hdq_fck)) {
                dev_dbg(&pdev->dev, "Can't get HDQ clock objects\n");