diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-03-11 05:46:03 -0500 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-03-11 05:46:03 -0500 |
| commit | a45216547e8925078b18b2a6b539100c3814e973 (patch) | |
| tree | fd07faaf4ad557152d71b336f9304c93075f41ed /drivers/gpu/drm/tilcdc/tilcdc_drv.c | |
| parent | 35dc8aabc8783d6322a59d774af2858e5955d2ab (diff) | |
| parent | 76adb460fd939756db689f238d5c2ddb45469705 (diff) | |
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/tilcdc/tilcdc_drv.c')
| -rw-r--r-- | drivers/gpu/drm/tilcdc/tilcdc_drv.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c index 81d80a2ffeb1..5b4ed0ea7768 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c | |||
| @@ -245,7 +245,6 @@ static int tilcdc_init(struct drm_driver *ddrv, struct device *dev) | |||
| 245 | if (IS_ERR(ddev)) | 245 | if (IS_ERR(ddev)) |
| 246 | return PTR_ERR(ddev); | 246 | return PTR_ERR(ddev); |
| 247 | 247 | ||
| 248 | ddev->platformdev = pdev; | ||
| 249 | ddev->dev_private = priv; | 248 | ddev->dev_private = priv; |
| 250 | platform_set_drvdata(pdev, ddev); | 249 | platform_set_drvdata(pdev, ddev); |
| 251 | drm_mode_config_init(ddev); | 250 | drm_mode_config_init(ddev); |