diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-11-15 09:37:20 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-11-15 09:37:20 +1000 |
| commit | 4fb2ac6ebe3ece9cafb2bb6d4a2e8e4edb124637 (patch) | |
| tree | 36cb74b3b66246863d8c4378b6e4fefd87169e41 /include/drm/drm_dp_mst_helper.h | |
| parent | 8aa3dc3c17f886c14ef6bcb62720832409ded0a6 (diff) | |
| parent | 37d74578d819b1798dd2cff724438e345d118980 (diff) | |
| download | linux-4fb2ac6ebe3ece9cafb2bb6d4a2e8e4edb124637.tar.gz | |
Merge tag 'drm/fixes/for-3.19-rc1' of git://people.freedesktop.org/~tagr/linux into drm-next
drm: Miscellaneous fixes for v3.19-rc1 This is a small collection of fixes that I've been carrying around for a while now. Many of these have been posted and reviewed or acked. The few that haven't I deemed too trivial to bother. * tag 'drm/fixes/for-3.19-rc1' of git://people.freedesktop.org/~tagr/linux: video/hdmi: Relicense header under MIT license drm/gma500: mdfld: Reuse video/mipi_display.h drm: Make drm_mode_create_tv_properties() signature consistent drm: Implement drm_get_pci_dev() dummy for !PCI drm/prime: Use unsigned type for number of pages drm/gem: Fix typo in kerneldoc drm: Use const data when creating blob properties drm: Use size_t for blob property sizes
Diffstat (limited to 'include/drm/drm_dp_mst_helper.h')
| -rw-r--r-- | include/drm/drm_dp_mst_helper.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h index 05e85ee10e74..cec6383bbdb8 100644 --- a/include/drm/drm_dp_mst_helper.h +++ b/include/drm/drm_dp_mst_helper.h @@ -371,7 +371,7 @@ struct drm_dp_sideband_msg_tx { struct drm_dp_mst_topology_mgr; struct drm_dp_mst_topology_cbs { /* create a connector for a port */ - struct drm_connector *(*add_connector)(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, char *path); + struct drm_connector *(*add_connector)(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, const char *path); void (*destroy_connector)(struct drm_dp_mst_topology_mgr *mgr, struct drm_connector *connector); void (*hotplug)(struct drm_dp_mst_topology_mgr *mgr); |