diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:08:10 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:08:10 -0400 |
| commit | 08cab72f91c8b28ffabfd143119bccdd4a115ad7 (patch) | |
| tree | ccd5583971caecd82bf2d1e62691bf6e0362d650 /arch/arm/mach-omap2/board-am3517evm.c | |
| parent | 86c1e5a74af11e4817ffa6d7748d9ac1353b5b53 (diff) | |
| parent | f37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff) | |
Merge branch 'dt/gic' into next/dt
Conflicts:
arch/arm/include/asm/localtimer.h
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-omap2/board-generic.c
Diffstat (limited to 'arch/arm/mach-omap2/board-am3517evm.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-am3517evm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c index 7d842940c25..65a5912278a 100644 --- a/arch/arm/mach-omap2/board-am3517evm.c +++ b/arch/arm/mach-omap2/board-am3517evm.c | |||
| @@ -486,7 +486,7 @@ static void __init am3517_evm_init(void) | |||
| 486 | } | 486 | } |
| 487 | 487 | ||
| 488 | MACHINE_START(OMAP3517EVM, "OMAP3517/AM3517 EVM") | 488 | MACHINE_START(OMAP3517EVM, "OMAP3517/AM3517 EVM") |
| 489 | .boot_params = 0x80000100, | 489 | .atag_offset = 0x100, |
| 490 | .reserve = omap_reserve, | 490 | .reserve = omap_reserve, |
| 491 | .map_io = omap3_map_io, | 491 | .map_io = omap3_map_io, |
| 492 | .init_early = am35xx_init_early, | 492 | .init_early = am35xx_init_early, |