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-clps711x/edb7211-arch.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-clps711x/edb7211-arch.c')
| -rw-r--r-- | arch/arm/mach-clps711x/edb7211-arch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-clps711x/edb7211-arch.c b/arch/arm/mach-clps711x/edb7211-arch.c index 98ca5b2e940d..abf522d1ec9b 100644 --- a/arch/arm/mach-clps711x/edb7211-arch.c +++ b/arch/arm/mach-clps711x/edb7211-arch.c | |||
| @@ -57,7 +57,7 @@ fixup_edb7211(struct machine_desc *desc, struct tag *tags, | |||
| 57 | 57 | ||
| 58 | MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)") | 58 | MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)") |
| 59 | /* Maintainer: Jon McClintock */ | 59 | /* Maintainer: Jon McClintock */ |
| 60 | .boot_params = 0xc0020100, /* 0xc0000000 - 0xc001ffff can be video RAM */ | 60 | .atag_offset = 0x20100, /* 0xc0000000 - 0xc001ffff can be video RAM */ |
| 61 | .fixup = fixup_edb7211, | 61 | .fixup = fixup_edb7211, |
| 62 | .map_io = edb7211_map_io, | 62 | .map_io = edb7211_map_io, |
| 63 | .reserve = edb7211_reserve, | 63 | .reserve = edb7211_reserve, |