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-imx/mach-cpuimx35.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-imx/mach-cpuimx35.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-cpuimx35.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-cpuimx35.c b/arch/arm/mach-imx/mach-cpuimx35.c index 4bd083ba9af2..470b654b0e6e 100644 --- a/arch/arm/mach-imx/mach-cpuimx35.c +++ b/arch/arm/mach-imx/mach-cpuimx35.c | |||
| @@ -194,7 +194,7 @@ struct sys_timer eukrea_cpuimx35_timer = { | |||
| 194 | 194 | ||
| 195 | MACHINE_START(EUKREA_CPUIMX35SD, "Eukrea CPUIMX35") | 195 | MACHINE_START(EUKREA_CPUIMX35SD, "Eukrea CPUIMX35") |
| 196 | /* Maintainer: Eukrea Electromatique */ | 196 | /* Maintainer: Eukrea Electromatique */ |
| 197 | .boot_params = MX3x_PHYS_OFFSET + 0x100, | 197 | .atag_offset = 0x100, |
| 198 | .map_io = mx35_map_io, | 198 | .map_io = mx35_map_io, |
| 199 | .init_early = imx35_init_early, | 199 | .init_early = imx35_init_early, |
| 200 | .init_irq = mx35_init_irq, | 200 | .init_irq = mx35_init_irq, |