Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
[linux-3.10.git] / drivers / gpu / drm / tegra / hdmi.c
index 0daee8e..bb747f6 100644 (file)
@@ -15,8 +15,7 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
-
-#include <mach/clk.h>
+#include <linux/clk/tegra.h>
 
 #include <drm/drm_edid.h>
 
@@ -1251,9 +1250,9 @@ static int tegra_hdmi_probe(struct platform_device *pdev)
        if (!regs)
                return -ENXIO;
 
-       hdmi->regs = devm_request_and_ioremap(&pdev->dev, regs);
-       if (!hdmi->regs)
-               return -EADDRNOTAVAIL;
+       hdmi->regs = devm_ioremap_resource(&pdev->dev, regs);
+       if (IS_ERR(hdmi->regs))
+               return PTR_ERR(hdmi->regs);
 
        err = platform_get_irq(pdev, 0);
        if (err < 0)