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-am3517crane.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-am3517crane.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-am3517crane.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-am3517crane.c b/arch/arm/mach-omap2/board-am3517crane.c index 9e1b2c24832..7834536ab41 100644 --- a/arch/arm/mach-omap2/board-am3517crane.c +++ b/arch/arm/mach-omap2/board-am3517crane.c | |||
| @@ -93,7 +93,7 @@ static void __init am3517_crane_init(void) | |||
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | MACHINE_START(CRANEBOARD, "AM3517/05 CRANEBOARD") | 95 | MACHINE_START(CRANEBOARD, "AM3517/05 CRANEBOARD") |
| 96 | .boot_params = 0x80000100, | 96 | .atag_offset = 0x100, |
| 97 | .reserve = omap_reserve, | 97 | .reserve = omap_reserve, |
| 98 | .map_io = omap3_map_io, | 98 | .map_io = omap3_map_io, |
| 99 | .init_early = am35xx_init_early, | 99 | .init_early = am35xx_init_early, |