diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-10-28 09:16:43 +0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-10-28 09:16:43 +0400 |
| commit | d4d9781d1dd04ff134e3d43383dfa9991f7c54c6 (patch) | |
| tree | 28e799ec49f72bf37f39d192d21f25bffb682aab /arch/arm/mach-bcmring/Makefile.boot | |
| parent | f5a18f932e051ff0f19dcd80a421a4dd9b11f10f (diff) | |
| parent | 396e6e49c58bb23d1814d3c240c736c9f01523c5 (diff) | |
| download | linux-d4d9781d1dd04ff134e3d43383dfa9991f7c54c6.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
Diffstat (limited to 'arch/arm/mach-bcmring/Makefile.boot')
| -rw-r--r-- | arch/arm/mach-bcmring/Makefile.boot | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-bcmring/Makefile.boot b/arch/arm/mach-bcmring/Makefile.boot index fb53b283bebb..aef2467757fa 100644 --- a/arch/arm/mach-bcmring/Makefile.boot +++ b/arch/arm/mach-bcmring/Makefile.boot @@ -1,6 +1,6 @@ # Address where decompressor will be written and eventually executed. # # default to SDRAM -zreladdr-y := $(CONFIG_BCM_ZRELADDR) +zreladdr-y += $(CONFIG_BCM_ZRELADDR) params_phys-y := 0x00000800 |