diff options
author | Daniel Vetter | 2017-03-11 11:46:03 +0100 |
---|---|---|
committer | Daniel Vetter | 2017-03-11 11:46:03 +0100 |
commit | a45216547e8925078b18b2a6b539100c3814e973 (patch) | |
tree | fd07faaf4ad557152d71b336f9304c93075f41ed /drivers/gpu/drm/msm/msm_drv.c | |
parent | drm: bridge: dw-hdmi: Move the driver to a separate directory. (diff) | |
parent | drm: Remove the struct drm_device platformdev field (diff) | |
download | kernel-qcow2-linux-a45216547e8925078b18b2a6b539100c3814e973.tar.gz kernel-qcow2-linux-a45216547e8925078b18b2a6b539100c3814e973.tar.xz kernel-qcow2-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/msm/msm_drv.c')
-rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 604331f3cf39..9208e67be453 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -386,7 +386,6 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) } platform_set_drvdata(pdev, ddev); - ddev->platformdev = pdev; priv = kzalloc(sizeof(*priv), GFP_KERNEL); if (!priv) { |