From 6dc5259a31e111e69678e767a1333139886e7921 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@gmail.com>
Date: Mon, 17 Jan 2011 18:08:58 +0000
Subject: [PATCH] --- yaml --- r: 232322 b: refs/heads/master c:
 369d7ec14cf2a07d3c7826d806f61477866ba523 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/gpu/drm/radeon/r100.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2d82d05e6ced..a30f6b8feea1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29d9ebc4820ee4e03776ddd9a34f3d0097595405
+refs/heads/master: 369d7ec14cf2a07d3c7826d806f61477866ba523
diff --git a/trunk/drivers/gpu/drm/radeon/r100.c b/trunk/drivers/gpu/drm/radeon/r100.c
index 46da5142b131..5968dde243e9 100644
--- a/trunk/drivers/gpu/drm/radeon/r100.c
+++ b/trunk/drivers/gpu/drm/radeon/r100.c
@@ -3522,7 +3522,7 @@ int r100_ring_test(struct radeon_device *rdev)
 	if (i < rdev->usec_timeout) {
 		DRM_INFO("ring test succeeded in %d usecs\n", i);
 	} else {
-		DRM_ERROR("radeon: ring test failed (sracth(0x%04X)=0x%08X)\n",
+		DRM_ERROR("radeon: ring test failed (scratch(0x%04X)=0x%08X)\n",
 			  scratch, tmp);
 		r = -EINVAL;
 	}