From 1a96bc153f81d8cd4fb4ac07cdc26bcf11fdbefa Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Mon, 23 Aug 2010 22:53:30 +0200 Subject: [PATCH] --- yaml --- r: 217872 b: refs/heads/master c: a2a273c94357ffd24e635cf9ec9b2e5c6f02b63b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_drawable.c | 3 +-- trunk/include/drm/drmP.h | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4ca5380e0916..d82d4000cb06 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3da8f7d2d1fa81fb65cb3f5d9e50dde40a83182 +refs/heads/master: a2a273c94357ffd24e635cf9ec9b2e5c6f02b63b diff --git a/trunk/drivers/gpu/drm/drm_drawable.c b/trunk/drivers/gpu/drm/drm_drawable.c index c53c9768cc11..170e53178d8b 100644 --- a/trunk/drivers/gpu/drm/drm_drawable.c +++ b/trunk/drivers/gpu/drm/drm_drawable.c @@ -173,11 +173,10 @@ int drm_update_drawable_info(struct drm_device *dev, void *data, struct drm_file /** * Caller must hold the drawable spinlock! */ -struct drm_drawable_info *drm_get_drawable_info(struct drm_device *dev, drm_drawable_t id) +static struct drm_drawable_info *drm_get_drawable_info(struct drm_device *dev, drm_drawable_t id) { return idr_find(&dev->drw_idr, id); } -EXPORT_SYMBOL(drm_get_drawable_info); static int drm_drawable_free(int idr, void *p, void *data) { diff --git a/trunk/include/drm/drmP.h b/trunk/include/drm/drmP.h index eb4f7edcc314..7a5c91c2aa60 100644 --- a/trunk/include/drm/drmP.h +++ b/trunk/include/drm/drmP.h @@ -1238,8 +1238,6 @@ extern int drm_rmdraw(struct drm_device *dev, void *data, struct drm_file *file_priv); extern int drm_update_drawable_info(struct drm_device *dev, void *data, struct drm_file *file_priv); -extern struct drm_drawable_info *drm_get_drawable_info(struct drm_device *dev, - drm_drawable_t id); extern void drm_drawable_free_all(struct drm_device *dev); /* Authentication IOCTL support (drm_auth.h) */