diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 15:07:42 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 15:07:42 -0400 |
| commit | 71f2c153755442c05d15cd025484f676a5f3541f (patch) | |
| tree | fe48af6ddc33da7a0aaf1a16ed9feeafa4a8e1e1 /arch/arm/mach-dove/cm-a510.c | |
| parent | 8efc59ad6764ade520012cb192cd484e5191cd9c (diff) | |
| parent | c825dda905bac330c2da7fabdf5c0ac28758b3cd (diff) | |
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-dove/cm-a510.c')
| -rw-r--r-- | arch/arm/mach-dove/cm-a510.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-dove/cm-a510.c b/arch/arm/mach-dove/cm-a510.c index 03e11f9dca97..c8a406f7e946 100644 --- a/arch/arm/mach-dove/cm-a510.c +++ b/arch/arm/mach-dove/cm-a510.c | |||
| @@ -87,7 +87,7 @@ static void __init cm_a510_init(void) | |||
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | MACHINE_START(CM_A510, "Compulab CM-A510 Board") | 89 | MACHINE_START(CM_A510, "Compulab CM-A510 Board") |
| 90 | .boot_params = 0x00000100, | 90 | .atag_offset = 0x100, |
| 91 | .init_machine = cm_a510_init, | 91 | .init_machine = cm_a510_init, |
| 92 | .map_io = dove_map_io, | 92 | .map_io = dove_map_io, |
| 93 | .init_early = dove_init_early, | 93 | .init_early = dove_init_early, |