git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc
[pandora-kernel.git]
/
arch
/
arm
/
mach-tegra
/
Makefile.boot
diff --git
a/arch/arm/mach-tegra/Makefile.boot
b/arch/arm/mach-tegra/Makefile.boot
index
a2356ad
..
bd12c9f
100644
(file)
--- a/
arch/arm/mach-tegra/Makefile.boot
+++ b/
arch/arm/mach-tegra/Makefile.boot
@@
-1,4
+1,4
@@
-zreladdr-$(CONFIG_ARCH_TEGRA_2x_SOC)
:
= 0x00008000
+zreladdr-$(CONFIG_ARCH_TEGRA_2x_SOC)
+
= 0x00008000
params_phys-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00000100
initrd_phys-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00800000