Merge branch 'master' into for-next

[safe/jmp/linux-2.6] / arch / arm / mach-at91 / Makefile.boot

diff --git a/arch/arm/mach-at91/Makefile.boot b/arch/arm/mach-at91/Makefile.boot
index 071a250..3462b81 100644 (file)
--- a/arch/arm/mach-at91/Makefile.boot
+++ b/arch/arm/mach-at91/Makefile.boot
@@ -7,6 +7,10 @@ ifeq ($(CONFIG_ARCH_AT91CAP9),y)
    zreladdr-y  := 0x70008000
 params_phys-y  := 0x70000100
 initrd_phys-y  := 0x70410000
+else ifeq ($(CONFIG_ARCH_AT91SAM9G45),y)
+   zreladdr-y  := 0x70008000
+params_phys-y  := 0x70000100
+initrd_phys-y  := 0x70410000
 else
    zreladdr-y  := 0x20008000
 params_phys-y  := 0x20000100