Merge ../linux-2.6-watchdog-mm

[sfrench/cifs-2.6.git] / arch / avr32 / mm / init.c

diff --git a/arch/avr32/mm/init.c b/arch/avr32/mm/init.c
index 3e6c4103980855281164ea4acdfe945fa6819b85..70da6894acc1dbfbde9d4501115c6d6eb26ea135 100644 (file)
--- a/arch/avr32/mm/init.c
+++ b/arch/avr32/mm/init.c
@@ -206,7 +206,7 @@ void __init setup_bootmem(void)
 
        if (mem_ramdisk) {
 #ifdef CONFIG_BLK_DEV_INITRD
-               initrd_start = __va(mem_ramdisk->addr);
+               initrd_start = (unsigned long)__va(mem_ramdisk->addr);
                initrd_end = initrd_start + mem_ramdisk->size;
 
                print_memory_map("RAMDISK images", mem_ramdisk);