From 5eacfa674c140c8d59221842e8f740ba0cb04fdc Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Tue, 15 Sep 2009 22:57:31 +0200 Subject: [PATCH] --- yaml --- r: 174515 b: refs/heads/master c: 7a9c906094de8b3dc227de448019dbc386cd25d4 h: refs/heads/master i: 174513: f2b58fe55f399deaafc6205090e81401c72e44dd 174511: d38eb0e547c7604895a0638752733afc389cc7fd v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_crtc.c | 3 ++- trunk/include/drm/drm_crtc.h | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8459ebb6d1ba..47cb328f2066 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97f5ab6651a996ecefed73e41684422f3b29d9a8 +refs/heads/master: 7a9c906094de8b3dc227de448019dbc386cd25d4 diff --git a/trunk/drivers/gpu/drm/drm_crtc.c b/trunk/drivers/gpu/drm/drm_crtc.c index 5cae0b3eee9b..ee0cde1ecca5 100644 --- a/trunk/drivers/gpu/drm/drm_crtc.c +++ b/trunk/drivers/gpu/drm/drm_crtc.c @@ -247,7 +247,8 @@ static void drm_mode_object_put(struct drm_device *dev, mutex_unlock(&dev->mode_config.idr_mutex); } -void *drm_mode_object_find(struct drm_device *dev, uint32_t id, uint32_t type) +struct drm_mode_object *drm_mode_object_find(struct drm_device *dev, + uint32_t id, uint32_t type) { struct drm_mode_object *obj = NULL; diff --git a/trunk/include/drm/drm_crtc.h b/trunk/include/drm/drm_crtc.h index b69347b8904f..bfcc60d101db 100644 --- a/trunk/include/drm/drm_crtc.h +++ b/trunk/include/drm/drm_crtc.h @@ -711,7 +711,8 @@ extern void drm_mode_connector_detach_encoder(struct drm_connector *connector, struct drm_encoder *encoder); extern bool drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc, int gamma_size); -extern void *drm_mode_object_find(struct drm_device *dev, uint32_t id, uint32_t type); +extern struct drm_mode_object *drm_mode_object_find(struct drm_device *dev, + uint32_t id, uint32_t type); /* IOCTLs */ extern int drm_mode_getresources(struct drm_device *dev, void *data, struct drm_file *file_priv);