diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2014-08-29 06:12:45 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-09-10 03:43:27 -0400 |
| commit | d4f68a7506e924e28a9153933076628002ba8bbc (patch) | |
| tree | 339bb74dceb7476fd1ace6a18e499a440a045cb4 /include/drm | |
| parent | c5786fe5f1c50941dbe27fc8b4aa1afee46ae893 (diff) | |
drm: merge drm_usb into udl
This merges all the remains of drm_usb into its only user, udl. We can
then drop all the drm_usb stuff, including dev->usbdev.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drmP.h | 1 | ||||
| -rw-r--r-- | include/drm/drm_usb.h | 15 |
2 files changed, 0 insertions, 16 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 5ae388a9bb98..0e73aad225b2 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
| @@ -1020,7 +1020,6 @@ struct drm_device { | |||
| 1020 | #endif | 1020 | #endif |
| 1021 | 1021 | ||
| 1022 | struct platform_device *platformdev; /**< Platform device struture */ | 1022 | struct platform_device *platformdev; /**< Platform device struture */ |
| 1023 | struct usb_device *usbdev; | ||
| 1024 | 1023 | ||
| 1025 | struct drm_sg_mem *sg; /**< Scatter gather memory */ | 1024 | struct drm_sg_mem *sg; /**< Scatter gather memory */ |
| 1026 | unsigned int num_crtcs; /**< Number of CRTCs on this device */ | 1025 | unsigned int num_crtcs; /**< Number of CRTCs on this device */ |
diff --git a/include/drm/drm_usb.h b/include/drm/drm_usb.h deleted file mode 100644 index 33506c11da8b..000000000000 --- a/include/drm/drm_usb.h +++ /dev/null | |||
| @@ -1,15 +0,0 @@ | |||
| 1 | #ifndef DRM_USB_H | ||
| 2 | #define DRM_USB_H | ||
| 3 | |||
| 4 | #include <drmP.h> | ||
| 5 | |||
| 6 | #include <linux/usb.h> | ||
| 7 | |||
| 8 | extern int drm_usb_init(struct drm_driver *driver, struct usb_driver *udriver); | ||
| 9 | extern void drm_usb_exit(struct drm_driver *driver, struct usb_driver *udriver); | ||
| 10 | |||
| 11 | int drm_get_usb_dev(struct usb_interface *interface, | ||
| 12 | const struct usb_device_id *id, | ||
| 13 | struct drm_driver *driver); | ||
| 14 | |||
| 15 | #endif | ||