summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/vmwgfx
diff options
context:
space:
mode:
authorMark Brown2011-04-18 18:12:14 +0200
committerMark Brown2011-04-18 18:12:14 +0200
commitfac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch)
tree1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /drivers/gpu/drm/vmwgfx
parentARM: s3c2440: gta02; Register dfbmcs320 device for BT audio interface (diff)
parentLinux 2.6.39-rc3 (diff)
downloadkernel-qcow2-linux-fac56c2df51bc29b07b3c2dcfabf32a015a0522c.tar.gz
kernel-qcow2-linux-fac56c2df51bc29b07b3c2dcfabf32a015a0522c.tar.xz
kernel-qcow2-linux-fac56c2df51bc29b07b3c2dcfabf32a015a0522c.zip
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'drivers/gpu/drm/vmwgfx')
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_kms.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index cceeb42789b6..dfe32e62bd90 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -245,7 +245,7 @@ void vmw_kms_cursor_snoop(struct vmw_surface *srf,
/* TODO handle none page aligned offsets */
/* TODO handle partial uploads and pitch != 256 */
/* TODO handle more then one copy (size != 64) */
- DRM_ERROR("lazy programer, cant handle wierd stuff\n");
+ DRM_ERROR("lazy programmer, can't handle weird stuff\n");
return;
}