diff options
| author | Alan Cox <alan@linux.intel.com> | 2011-08-09 14:30:37 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-09 08:34:50 -0700 |
| commit | ab04fc5890381e7dc907e809d27bf0f683de6e82 (patch) | |
| tree | 200e32b514ef192ea55f75a5d9c9c320493d165d /drivers/staging/gma500/gem_glue.h | |
| parent | 87302700402b2708c49f89970c295465cc8e5523 (diff) | |
| download | op-kernel-dev-ab04fc5890381e7dc907e809d27bf0f683de6e82.zip op-kernel-dev-ab04fc5890381e7dc907e809d27bf0f683de6e82.tar.gz | |
gma500: Fix clashes with DRM updates
The private object support has migrated from gma500 into the DRM core,
remove our now clashing copy.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/staging/gma500/gem_glue.h')
| -rw-r--r-- | drivers/staging/gma500/gem_glue.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/gma500/gem_glue.h b/drivers/staging/gma500/gem_glue.h index a0f2bc4..ce5ce30 100644 --- a/drivers/staging/gma500/gem_glue.h +++ b/drivers/staging/gma500/gem_glue.h @@ -1,4 +1,2 @@ extern void drm_gem_object_release_wrap(struct drm_gem_object *obj); -extern int drm_gem_private_object_init(struct drm_device *dev, - struct drm_gem_object *obj, size_t size); extern int gem_create_mmap_offset(struct drm_gem_object *obj); |
