Merge branch 'for-next' into for-linus

[safe/jmp/linux-2.6] / drivers / gpu / drm / radeon / radeon_state.c

diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
index 3c32f84..40ab6d9 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_state.c
+++ b/drivers/gpu/drm/radeon/radeon_state.c
@@ -1093,7 +1093,7 @@ static void radeon_cp_dispatch_clear(struct drm_device * dev,
                                        /* judging by the first tile offset needed, could possibly
                                           directly address/clear 4x4 tiles instead of 8x2 * 4x4
                                           macro tiles, though would still need clear mask for
-                                          right/bottom if truely 4x4 granularity is desired ? */
+                                          right/bottom if truly 4x4 granularity is desired ? */
                                        OUT_RING(tileoffset * 16);
                                        /* the number of tiles to clear */
                                        OUT_RING(nrtilesx + 1);