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

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

diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 12fdebf9aed81e40ac7e7bda1a95d261a3356ffe..be271c42de4db0619957eca16583cba133ecdaac 100644 (file)
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -2464,7 +2464,7 @@ int r600_resume(struct radeon_device *rdev)
 
        r = r600_ib_test(rdev);
        if (r) {
-               DRM_ERROR("radeon: failled testing IB (%d).\n", r);
+               DRM_ERROR("radeon: failed testing IB (%d).\n", r);
                return r;
        }