diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:23:28 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:23:28 -0400 |
| commit | 929f58aeeb46f964d9468ce1addd993f5d92b11d (patch) | |
| tree | 95355731bd4d21d221cdc2a5ab073244ff76db65 /arch/arm/mach-omap2/board-cm-t3517.c | |
| parent | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff) | |
| parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-omap2/board-cm-t3517.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-cm-t3517.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-cm-t3517.c b/arch/arm/mach-omap2/board-cm-t3517.c index 05c72f4c1b5..aed9c29f9fa 100644 --- a/arch/arm/mach-omap2/board-cm-t3517.c +++ b/arch/arm/mach-omap2/board-cm-t3517.c | |||
| @@ -299,7 +299,7 @@ static void __init cm_t3517_init(void) | |||
| 299 | } | 299 | } |
| 300 | 300 | ||
| 301 | MACHINE_START(CM_T3517, "Compulab CM-T3517") | 301 | MACHINE_START(CM_T3517, "Compulab CM-T3517") |
| 302 | .boot_params = 0x80000100, | 302 | .atag_offset = 0x100, |
| 303 | .reserve = omap_reserve, | 303 | .reserve = omap_reserve, |
| 304 | .map_io = omap3_map_io, | 304 | .map_io = omap3_map_io, |
| 305 | .init_early = cm_t3517_init_early, | 305 | .init_early = cm_t3517_init_early, |