aboutsummaryrefslogtreecommitdiff
path: root/drivers/video/fbdev/omap2/omapfb/dss/core.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-08-11 11:44:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-08-11 11:44:18 -0700
commit7eb97ba611f5904abb3e0653b005904d9144c81a (patch)
tree2daa1275e9ee7298a88d53e0913fb363e61b9551 /drivers/video/fbdev/omap2/omapfb/dss/core.c
parent2bfc37cdef08844c77f801a1beaa1f4efd3215df (diff)
parentdd0c41f8a7e0babdadc61d5201ac8505a79dec05 (diff)
downloadlinux-stericsson-7eb97ba611f5904abb3e0653b005904d9144c81a.tar.gz
Merge tag 'fbdev-v4.13-rc5' of git://github.com/bzolnier/linux
Pull fbdev fixes from Bartlomiej Zolnierkiewicz: - allow user to disable write combined mapping in efifb driver (Dave Airlie) - fix use after free bugs on driver removal in imxfb driver (Dan Carpenter) - fix unused variable warning in omapfb driver (Arnd Bergmann) * tag 'fbdev-v4.13-rc5' of git://github.com/bzolnier/linux: efifb: allow user to disable write combined mapping. fbdev: omapfb: remove unused variable video: fbdev: imxfb: use after free in imxfb_remove()
Diffstat (limited to 'drivers/video/fbdev/omap2/omapfb/dss/core.c')
-rw-r--r--drivers/video/fbdev/omap2/omapfb/dss/core.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/core.c b/drivers/video/fbdev/omap2/omapfb/dss/core.c
index eecf695c16f4..09e5bb013d28 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/core.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/core.c
@@ -193,7 +193,6 @@ static struct notifier_block omap_dss_pm_notif_block = {
static int __init omap_dss_probe(struct platform_device *pdev)
{
- struct omap_dss_board_info *pdata = pdev->dev.platform_data;
int r;
core.pdev = pdev;