summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv210/Makefile.boot
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-03-03 00:40:15 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-03-03 00:40:15 +0100
commit882d01f96bc1909455696aae6eb7ce4df3e908c8 (patch)
tree06e5789cb33d0547c2497fd4d0327dc9e8614d37 /arch/arm/mach-s5pv210/Makefile.boot
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into dev... (diff)
parentARM: S3C64XX: Add initial support for board specific IRQs (diff)
downloadlinux-882d01f96bc1909455696aae6eb7ce4df3e908c8.tar.xz
linux-882d01f96bc1909455696aae6eb7ce4df3e908c8.zip
Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts: arch/arm/Kconfig arch/arm/Makefile
Diffstat (limited to 'arch/arm/mach-s5pv210/Makefile.boot')
-rw-r--r--arch/arm/mach-s5pv210/Makefile.boot2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/Makefile.boot b/arch/arm/mach-s5pv210/Makefile.boot
new file mode 100644
index 000000000000..ff90aa13bd67
--- /dev/null
+++ b/arch/arm/mach-s5pv210/Makefile.boot
@@ -0,0 +1,2 @@
+ zreladdr-y := 0x20008000
+params_phys-y := 0x20000100