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 /drivers/gpu/drm/i915/intel_dp_mst.c | |
| parent | 8aa3dc3c17f886c14ef6bcb62720832409ded0a6 (diff) | |
| parent | 37d74578d819b1798dd2cff724438e345d118980 (diff) | |
| download | linux-stable-4fb2ac6ebe3ece9cafb2bb6d4a2e8e4edb124637.tar.gz linux-stable-4fb2ac6ebe3ece9cafb2bb6d4a2e8e4edb124637.tar.bz2 linux-stable-4fb2ac6ebe3ece9cafb2bb6d4a2e8e4edb124637.zip | |
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 'drivers/gpu/drm/i915/intel_dp_mst.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp_mst.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c index b03fa9026a9c..bfe359506377 100644 --- a/drivers/gpu/drm/i915/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/intel_dp_mst.c @@ -385,7 +385,7 @@ static void intel_connector_remove_from_fbdev(struct intel_connector *connector) #endif } -static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, char *pathprop) +static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, const char *pathprop) { struct intel_dp *intel_dp = container_of(mgr, struct intel_dp, mst_mgr); struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); |