Merge tag 'fixes-non-3.11-2' of git://git.infradead.org/users/jcooper/linux into...

[~andy/linux] / arch / arm / mach-omap2 / display.c

diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index cc75aaf6e7642396947a9dac47c12115edc45fae..ff37be1f6f932cdd3585db7b11e4603dc69044ad 100644 (file)
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -226,7 +226,7 @@ static struct platform_device *create_dss_pdev(const char *pdev_name,
                dev_set_name(&pdev->dev, "%s", pdev->name);
 
        ohs[0] = oh;
-       od = omap_device_alloc(pdev, ohs, 1, NULL, 0);
+       od = omap_device_alloc(pdev, ohs, 1);
        if (IS_ERR(od)) {
                pr_err("Could not alloc omap_device for %s\n", pdev_name);
                r = -ENOMEM;