aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs/Makefile.boot
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-01-07 10:29:26 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-01-07 10:29:26 +0900
commit5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee (patch)
tree4f4e321a1ca0baf64d8af528080c71f93495a7d7 /arch/arm/mach-mxs/Makefile.boot
parentARM: mach-shmobile: mackerel: Add HDMI sound support (diff)
parentMerge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm (diff)
downloadlinux-dev-5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee.tar.xz
linux-dev-5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest
Conflicts: arch/arm/mach-shmobile/Kconfig Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/arm/mach-mxs/Makefile.boot')
-rw-r--r--arch/arm/mach-mxs/Makefile.boot1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/Makefile.boot b/arch/arm/mach-mxs/Makefile.boot
new file mode 100644
index 000000000000..eb541e0291da
--- /dev/null
+++ b/arch/arm/mach-mxs/Makefile.boot
@@ -0,0 +1 @@
+zreladdr-y := 0x40008000