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 /include/drm | |
| 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 'include/drm')
| -rw-r--r-- | include/drm/drmP.h | 1 | ||||
| -rw-r--r-- | include/drm/drm_pci.h | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 4a0260e2b067..0e383438f793 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -501,7 +501,6 @@ struct drm_device { struct pci_controller *hose; #endif - struct platform_device *platformdev; /**< Platform device struture */ struct virtio_device *virtdev; struct drm_sg_mem *sg; /**< Scatter gather memory */ diff --git a/include/drm/drm_pci.h b/include/drm/drm_pci.h index 5081b3eba309..f5ebfcaf69e0 100644 --- a/include/drm/drm_pci.h +++ b/include/drm/drm_pci.h @@ -72,7 +72,4 @@ static inline int drm_pci_set_busid(struct drm_device *dev, extern int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *speed_mask); extern int drm_pcie_get_max_link_width(struct drm_device *dev, u32 *mlw); -/* platform section */ -extern int drm_platform_init(struct drm_driver *driver, struct platform_device *platform_device); - #endif /* _DRM_PCI_H_ */ |