From cc9751c150007bbc315b3b01f03d738e89324024 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 25 Oct 2012 13:59:18 +0200
Subject: [PATCH] --- yaml --- r: 339831 b: refs/heads/master c:
 0bd1e3240ee49cba6fe243a317e07c8cc8e27334 h: refs/heads/master i:   339829:
 d0936dabfd90800be146a40533f4a2e0bb0c2b8a   339827:
 f2914574bff57183593b5bf6c8523d142d402e93   339823:
 cfbc6d8e266d88f16c35d68e196be278bf4078bf v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/arm/mach-bcm2835/Makefile.boot | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

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