diff options
| author | Greg Kroah-Hartman <[email protected]> | 2019-01-15 14:20:53 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2019-01-15 14:20:53 +0000 |
| commit | bdfe0df1e97beedc15f68ee6556830548e81f63f (patch) | |
| tree | ed4f0eb7acb8814642eb1fb4da0ac28704dc4fe0 /include/drm/drm_dp_mst_helper.h | |
| parent | driver core: drop use of BUS_ATTR() (diff) | |
| parent | Linux 5.0-rc2 (diff) | |
| download | kernel-bdfe0df1e97beedc15f68ee6556830548e81f63f.tar.gz kernel-bdfe0df1e97beedc15f68ee6556830548e81f63f.zip | |
Merge 5.0-rc2 into driver-core-next
We want the driver core changes in that branch in here to build on top
of.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'include/drm/drm_dp_mst_helper.h')
| -rw-r--r-- | include/drm/drm_dp_mst_helper.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h index 59f005b419cf..727af08e5ea6 100644 --- a/include/drm/drm_dp_mst_helper.h +++ b/include/drm/drm_dp_mst_helper.h @@ -616,7 +616,8 @@ void drm_dp_mst_dump_topology(struct seq_file *m, struct drm_dp_mst_topology_mgr *mgr); void drm_dp_mst_topology_mgr_suspend(struct drm_dp_mst_topology_mgr *mgr); -int drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr); +int __must_check +drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr); struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_atomic_state *state, struct drm_dp_mst_topology_mgr *mgr); int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state, |