Merge branches 'gemini' and 'misc' into devel

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index 8417cc4c43f1..2092e7bb788f 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -34,6 +34,7 @@
  */
 
 #include <linux/vmalloc.h>
+#include <linux/slab.h>
 #include <linux/log2.h>
 #include <asm/shmparam.h>
 #include "drmP.h"
@@ -960,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) {