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

[pandora-kernel.git] / drivers / gpu / drm / radeon / r100.c

diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index fcc23e4..f2204cb 100644 (file)
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -3617,7 +3617,7 @@ int r100_ib_test(struct radeon_device *rdev)
        if (i < rdev->usec_timeout) {
                DRM_INFO("ib test succeeded in %u usecs\n", i);
        } else {
-               DRM_ERROR("radeon: ib test failed (sracth(0x%04X)=0x%08X)\n",
+               DRM_ERROR("radeon: ib test failed (scratch(0x%04X)=0x%08X)\n",
                          scratch, tmp);
                r = -EINVAL;
        }
@@ -3637,13 +3637,13 @@ int r100_ib_init(struct radeon_device *rdev)
 
        r = radeon_ib_pool_init(rdev);
        if (r) {
-               dev_err(rdev->dev, "failled initializing IB pool (%d).\n", r);
+               dev_err(rdev->dev, "failed initializing IB pool (%d).\n", r);
                r100_ib_fini(rdev);
                return r;
        }
        r = r100_ib_test(rdev);
        if (r) {
-               dev_err(rdev->dev, "failled testing IB (%d).\n", r);
+               dev_err(rdev->dev, "failed testing IB (%d).\n", r);
                r100_ib_fini(rdev);
                return r;
        }
@@ -3799,12 +3799,12 @@ static int r100_startup(struct radeon_device *rdev)
        /* 1M ring buffer */
        r = r100_cp_init(rdev, 1024 * 1024);
        if (r) {
-               dev_err(rdev->dev, "failled initializing CP (%d).\n", r);
+               dev_err(rdev->dev, "failed initializing CP (%d).\n", r);
                return r;
        }
        r = r100_ib_init(rdev);
        if (r) {
-               dev_err(rdev->dev, "failled initializing IB (%d).\n", r);
+               dev_err(rdev->dev, "failed initializing IB (%d).\n", r);
                return r;
        }
        return 0;