Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[karo-tx-linux.git] / drivers / gpu / drm / radeon / rv515.c

diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
index 959bf4483beab43766d795ba75002f40c3d04558..c520d06a930c06e10cb49c9017574dec2b692c36 100644 (file)
--- a/drivers/gpu/drm/radeon/rv515.c
+++ b/drivers/gpu/drm/radeon/rv515.c
@@ -150,7 +150,7 @@ void rv515_gpu_init(struct radeon_device *rdev)
 
        if (r100_gui_wait_for_idle(rdev)) {
                printk(KERN_WARNING "Failed to wait GUI idle while "
-                      "reseting GPU. Bad things might happen.\n");
+                      "resetting GPU. Bad things might happen.\n");
        }
        rv515_vga_render_disable(rdev);
        r420_pipes_init(rdev);
@@ -162,7 +162,7 @@ void rv515_gpu_init(struct radeon_device *rdev)
        WREG32_PLL(0x000D, tmp);
        if (r100_gui_wait_for_idle(rdev)) {
                printk(KERN_WARNING "Failed to wait GUI idle while "
-                      "reseting GPU. Bad things might happen.\n");
+                      "resetting GPU. Bad things might happen.\n");
        }
        if (rv515_mc_wait_for_idle(rdev)) {
                printk(KERN_WARNING "Failed to wait MC idle while "