From fbb8c098df72cbe406d0ad3f986bd484e9217d78 Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Thu, 17 Sep 2009 22:59:54 +0300 Subject: [PATCH] --- yaml --- r: 164019 b: refs/heads/master c: 812c369dbf3b5a726b52bbfb8adbc230f3f81bcf h: refs/heads/master i: 164017: a44257ec6a2fdb0b0ae0126b5d5f6581132f726c 164015: 0da84200d9c23a91355602d5f148785f946f929a v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_bufs.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bfb93f4c8ca3..55f9bf6e8c24 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b1596af17dc9bf38c304f69fb253d6cfa73d136 +refs/heads/master: 812c369dbf3b5a726b52bbfb8adbc230f3f81bcf diff --git a/trunk/drivers/gpu/drm/drm_bufs.c b/trunk/drivers/gpu/drm/drm_bufs.c index 6246e3f3dad7..3d09e304f6f4 100644 --- a/trunk/drivers/gpu/drm/drm_bufs.c +++ b/trunk/drivers/gpu/drm/drm_bufs.c @@ -310,10 +310,10 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, (unsigned long long)map->offset, map->size); break; + } case _DRM_GEM: - DRM_ERROR("tried to rmmap GEM object\n"); + DRM_ERROR("tried to addmap GEM object\n"); break; - } case _DRM_SCATTER_GATHER: if (!dev->sg) { kfree(map);