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-shark/core.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-shark/core.c')
| -rw-r--r-- | arch/arm/mach-shark/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c index ac2873c8014b..feda3ca7fc95 100644 --- a/arch/arm/mach-shark/core.c +++ b/arch/arm/mach-shark/core.c | |||
| @@ -152,7 +152,7 @@ static struct sys_timer shark_timer = { | |||
| 152 | 152 | ||
| 153 | MACHINE_START(SHARK, "Shark") | 153 | MACHINE_START(SHARK, "Shark") |
| 154 | /* Maintainer: Alexander Schulz */ | 154 | /* Maintainer: Alexander Schulz */ |
| 155 | .boot_params = 0x08003000, | 155 | .atag_offset = 0x3000, |
| 156 | .map_io = shark_map_io, | 156 | .map_io = shark_map_io, |
| 157 | .init_irq = shark_init_irq, | 157 | .init_irq = shark_init_irq, |
| 158 | .timer = &shark_timer, | 158 | .timer = &shark_timer, |