Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
[~shefty/rdma-dev.git] / drivers / gpu / drm / radeon / rv515.c
index c0549b146bae6e909328508c30f9cea354220bb7..d8d78fe179469009a4adbaebda77eee13fcd7802 100644 (file)
@@ -149,7 +149,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);
@@ -161,7 +161,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 "