Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / drivers / gpu / drm / sti / sti_tvout.c

diff --git a/drivers/gpu/drm/sti/sti_tvout.c b/drivers/gpu/drm/sti/sti_tvout.c
index 5767e93..c36a8da 100644 (file)
--- a/drivers/gpu/drm/sti/sti_tvout.c
+++ b/drivers/gpu/drm/sti/sti_tvout.c
@@ -860,7 +860,7 @@ static int sti_tvout_probe(struct platform_device *pdev)
                DRM_ERROR("Invalid glue resource\n");
                return -ENOMEM;
        }
-       tvout->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));
+       tvout->regs = devm_ioremap(dev, res->start, resource_size(res));
        if (!tvout->regs)
                return -ENOMEM;