Merge tag 'v3.16' into drm-next

[karo-tx-linux.git] / include / drm / drm_modes.h

diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h
index 2dbbf997666937fc3a4efb57519d87ccb85c59cf..91d0582f924e3e90539f0373b4daaaa2b20ae9cb 100644 (file)
--- a/include/drm/drm_modes.h
+++ b/include/drm/drm_modes.h
@@ -223,7 +223,7 @@ void drm_mode_validate_size(struct drm_device *dev,
 void drm_mode_prune_invalid(struct drm_device *dev,
                            struct list_head *mode_list, bool verbose);
 void drm_mode_sort(struct list_head *mode_list);
-void drm_mode_connector_list_update(struct drm_connector *connector);
+void drm_mode_connector_list_update(struct drm_connector *connector, bool merge_type_bits);
 
 /* parsing cmdline modes */
 bool