mm: remove include/linux/bootmem.h

[linux-2.6-block.git] / arch / m68k / kernel / uboot.c

diff --git a/arch/m68k/kernel/uboot.c b/arch/m68k/kernel/uboot.c
index b29c3b241e1bb590eba500918e39e4ce9bc59796..1b4c562753da898fd62972b02b785dafc38528a6 100644 (file)
--- a/arch/m68k/kernel/uboot.c
+++ b/arch/m68k/kernel/uboot.c
@@ -16,7 +16,7 @@
 #include <linux/console.h>
 #include <linux/errno.h>
 #include <linux/string.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
 #include <linux/seq_file.h>
 #include <linux/init.h>
 #include <linux/initrd.h>
@@ -102,5 +102,5 @@ __init void process_uboot_commandline(char *commandp, int size)
        }
 
        parse_uboot_commandline(commandp, len);
-       commandp[size - 1] = 0;
+       commandp[len - 1] = 0;
 }