---

yaml --- r: 343039 b: refs/heads/master c: 501f9d4 h: refs/heads/master i: 343037: 9a0f64c 343035: a889509 343031: 35ee8d1 343023: 579ad38 343007: 3f121f2 342975: 2e16b64 342911: 8a6ae54 342783: fcefb45 342527: 90b7387 342015: d27ce33 v: v3
git-mirror · Nov 26, 2012 · 3256d75 · 3256d75
1 parent d54dc55
commit 3256d75
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 801b295e4fd4a8c3344fcf523a12ef5ac41de889
+refs/heads/master: 501f9d4c1d5cb524e7c2be1203b5edc4a8edf593
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_ring.c b/trunk/drivers/gpu/drm/radeon/radeon_ring.c
@@ -459,7 +459,7 @@ void radeon_ring_unlock_commit(struct radeon_device *rdev, struct radeon_ring *r
  *
  * @ring: radeon_ring structure holding ring information
  *
- * Reset the driver's copy of the wtpr (all asics).
+ * Reset the driver's copy of the wptr (all asics).
  */
 void radeon_ring_undo(struct radeon_ring *ring)
 {
@@ -503,7 +503,7 @@ void radeon_ring_force_activity(struct radeon_device *rdev, struct radeon_ring *
 }
 
 /**
- * radeon_ring_force_activity - update lockup variables
+ * radeon_ring_lockup_update - update lockup variables
  *
  * @ring: radeon_ring structure holding ring information
  *