diff --git a/[refs] b/[refs] index 884622178b79..b4f13dd5e08a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 686ea5851e776a85b8bebdc83a8e60c49c1924b3 +refs/heads/master: 0bd1e3240ee49cba6fe243a317e07c8cc8e27334 diff --git a/trunk/arch/arm/mach-bcm2835/Makefile.boot b/trunk/arch/arm/mach-bcm2835/Makefile.boot index 2d30e17f5b69..b3271754e9fd 100644 --- a/trunk/arch/arm/mach-bcm2835/Makefile.boot +++ b/trunk/arch/arm/mach-bcm2835/Makefile.boot @@ -1,3 +1 @@ - zreladdr-y := 0x00008000 -params_phys-y := 0x00000100 -initrd_phys-y := 0x00800000 +zreladdr-y := 0x00008000