Merge tag 'for-3.9-rc1' of git://gitorious.org/linux-pwm/linux-pwm

[~andy/linux] / drivers / gpu / drm / i915 / i915_debugfs.c

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 7c65ab83914a0ce50274797b708f2b5ba35b27ee..aae31489c89304f8d79ad2319bbb0ecb97897cef 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1550,7 +1550,7 @@ static const char *swizzle_string(unsigned swizzle)
        case I915_BIT_6_SWIZZLE_9_10_17:
                return "bit9/bit10/bit17";
        case I915_BIT_6_SWIZZLE_UNKNOWN:
-               return "unkown";
+               return "unknown";
        }
 
        return "bug";