Merge branch 'master' into for-next

[pandora-kernel.git] / drivers / gpu / drm / radeon / radeon_ring.c

diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index c6776e4..08c0233 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -194,7 +194,7 @@ int radeon_ib_pool_init(struct radeon_device *rdev)
        r = radeon_bo_kmap(rdev->ib_pool.robj, &ptr);
        radeon_bo_unreserve(rdev->ib_pool.robj);
        if (r) {
-               DRM_ERROR("radeon: failed to map ib poll (%d).\n", r);
+               DRM_ERROR("radeon: failed to map ib pool (%d).\n", r);
                return r;
        }
        for (i = 0; i < RADEON_IB_POOL_SIZE; i++) {