Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

2 files changed, 2 insertions, 1 deletions

diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index a0902c20d677..86425ab53bf5 100644
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c
@@ -20,6 +20,7 @@
 #include <linux/init.h>
 #include <linux/bootmem.h> /* max_low_pfn */
 #include <linux/vmalloc.h>
+#include <linux/gfp.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c
index 10b403554b65..7b2c56d8f930 100644
--- a/arch/alpha/mm/numa.c
+++ b/arch/alpha/mm/numa.c
@@ -197,7 +197,7 @@ setup_memory_node(int nid, void *kernel_end)
         }
 
         if (bootmap_start == -1)
-                panic("couldn't find a contigous place for the bootmap");
+                panic("couldn't find a contiguous place for the bootmap");
 
         /* Allocate the bootmap and mark the whole MM as reserved.  */
         bootmap_size = init_bootmem_node(NODE_DATA(nid), bootmap_start,