Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

[sfrench/cifs-2.6.git] / arch / alpha / mm / numa.c

diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c
index 10b403554b6530bf582e9bbf7895b8e91aac272f..7b2c56d8f930b89fc6747ccdca550456f35f83b6 100644 (file)
--- 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,