diff options
author | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 21:02:37 +0200 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 21:02:37 +0200 |
commit | 3a8254364277fabe01bc0e12b9691722939f5ef3 (patch) | |
tree | 0befa43780509144cc840f767859006409e0506d /arch/arm/mach-h720x/h7202-eval.c | |
parent | Linux 3.1-rc9 (diff) | |
parent | Merge branch 'ppi-irq-core-for-rmk' of git://github.com/mzyngier/arm-platform... (diff) | |
download | linux-3a8254364277fabe01bc0e12b9691722939f5ef3.tar.xz linux-3a8254364277fabe01bc0e12b9691722939f5ef3.zip |
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'arch/arm/mach-h720x/h7202-eval.c')
-rw-r--r-- | arch/arm/mach-h720x/h7202-eval.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-h720x/h7202-eval.c b/arch/arm/mach-h720x/h7202-eval.c index 884584a09752..284a134819e1 100644 --- a/arch/arm/mach-h720x/h7202-eval.c +++ b/arch/arm/mach-h720x/h7202-eval.c @@ -71,7 +71,7 @@ static void __init init_eval_h7202(void) MACHINE_START(H7202, "Hynix HMS30C7202") /* Maintainer: Robert Schwebel, Pengutronix */ - .boot_params = 0x40000100, + .atag_offset = 0x100, .map_io = h720x_map_io, .init_irq = h7202_init_irq, .timer = &h7202_timer, |