diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 19:25:01 -0400 |
| commit | 5725aeae5ff2e39f3815bbef788ee326c9afea2c (patch) | |
| tree | 4f32f936ba18384d48ab1e537b787a8ce666263f /arch/arm/mach-h720x/h7201-eval.c | |
| parent | 43872fa788060eef91ae437957e0a5e39f1c56fd (diff) | |
| parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) | |
Merge branch 'depends/rmk/memory_h' into next/fixes
Fix up all conflicts between the memory.h cleanup and bug fixes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-h720x/h7201-eval.c')
| -rw-r--r-- | arch/arm/mach-h720x/h7201-eval.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-h720x/h7201-eval.c b/arch/arm/mach-h720x/h7201-eval.c index 65f1bea958e5..9886f19805f4 100644 --- a/arch/arm/mach-h720x/h7201-eval.c +++ b/arch/arm/mach-h720x/h7201-eval.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | MACHINE_START(H7201, "Hynix GMS30C7201") | 30 | MACHINE_START(H7201, "Hynix GMS30C7201") |
| 31 | /* Maintainer: Robert Schwebel, Pengutronix */ | 31 | /* Maintainer: Robert Schwebel, Pengutronix */ |
| 32 | .boot_params = 0xc0001000, | 32 | .atag_offset = 0x1000, |
| 33 | .map_io = h720x_map_io, | 33 | .map_io = h720x_map_io, |
| 34 | .init_irq = h720x_init_irq, | 34 | .init_irq = h720x_init_irq, |
| 35 | .timer = &h7201_timer, | 35 | .timer = &h7201_timer, |