Merge branch 'master' into for-next

[safe/jmp/linux-2.6] / drivers / gpu / drm / drm_bufs.c

diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index f7ba82e..2092e7b 100644 (file)
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -961,7 +961,7 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request)
                dma->buflist[i + dma->buf_count] = &entry->buflist[i];
        }
 
-       /* No allocations failed, so now we can replace the orginal pagelist
+       /* No allocations failed, so now we can replace the original pagelist
         * with the new one.
         */
        if (dma->page_count) {