[AVR32] NMI debugging

[powerpc.git] / arch / avr32 / kernel / setup.c

diff --git a/arch/avr32/kernel/setup.c b/arch/avr32/kernel/setup.c
index bf1f016..4b4c188 100644 (file)
--- a/arch/avr32/kernel/setup.c
+++ b/arch/avr32/kernel/setup.c
@@ -248,7 +248,7 @@ static int __init early_parse_fbmem(char *p)
 
        fbmem_size = memparse(p, &p);
        if (*p == '@') {
-               fbmem_start = memparse(p, &p);
+               fbmem_start = memparse(p + 1, &p);
                ret = add_reserved_region(fbmem_start,
                                          fbmem_start + fbmem_size - 1,
                                          "Framebuffer");
@@ -313,7 +313,7 @@ __tagtable(ATAG_MEM, parse_tag_mem);
 
 static int __init parse_tag_rdimg(struct tag *tag)
 {
-#ifdef CONFIG_INITRD
+#ifdef CONFIG_BLK_DEV_INITRD
        struct tag_mem_range *mem = &tag->u.mem_range;
        int ret;