diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-03-11 11:46:03 +0100 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-03-11 11:46:03 +0100 |
commit | a45216547e8925078b18b2a6b539100c3814e973 (patch) | |
tree | fd07faaf4ad557152d71b336f9304c93075f41ed /drivers/gpu/drm/sti | |
parent | 35dc8aabc8783d6322a59d774af2858e5955d2ab (diff) | |
parent | 76adb460fd939756db689f238d5c2ddb45469705 (diff) | |
download | linux-a45216547e8925078b18b2a6b539100c3814e973.tar.gz linux-a45216547e8925078b18b2a6b539100c3814e973.tar.bz2 linux-a45216547e8925078b18b2a6b539100c3814e973.zip |
Merge branch 'drm/next/platform' of git://linuxtv.org/pinchartl/media into drm-misc-next
Merge Laurent's drm_platform removal code. Only conflict is with the
drm_pci.h extraction, which allows me to fix up the misplayed
drm_platform_init fumble that 0day and Stephen Rothwell reported.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/sti')
-rw-r--r-- | drivers/gpu/drm/sti/sti_drv.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c index 3b15c2cb2306..6003c664ba0b 100644 --- a/drivers/gpu/drm/sti/sti_drv.c +++ b/drivers/gpu/drm/sti/sti_drv.c @@ -263,8 +263,6 @@ static int sti_bind(struct device *dev) if (IS_ERR(ddev)) return PTR_ERR(ddev); - ddev->platformdev = to_platform_device(dev); - ret = sti_init(ddev); if (ret) goto err_drm_dev_unref; |