diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 05:54:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 05:54:51 -0400 |
| commit | ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (patch) | |
| tree | 07e491fd3b782d47811a1b3d31d51b0a0d4630df /arch/arm/mach-omap2/board-am3517crane.c | |
| parent | 0cd21ebcc51e6d2500e303446f68d86a6f473ccb (diff) | |
| parent | af6871683e25100813d35b3d802f1ed7b90b9f3a (diff) | |
Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable
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 933e9353cb37..db110fdb8b2c 100644 --- a/arch/arm/mach-omap2/board-am3517crane.c +++ b/arch/arm/mach-omap2/board-am3517crane.c | |||
| @@ -98,7 +98,7 @@ static void __init am3517_crane_init(void) | |||
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | MACHINE_START(CRANEBOARD, "AM3517/05 CRANEBOARD") | 100 | MACHINE_START(CRANEBOARD, "AM3517/05 CRANEBOARD") |
| 101 | .boot_params = 0x80000100, | 101 | .atag_offset = 0x100, |
| 102 | .reserve = omap_reserve, | 102 | .reserve = omap_reserve, |
| 103 | .map_io = omap3_map_io, | 103 | .map_io = omap3_map_io, |
| 104 | .init_early = am3517_crane_init_early, | 104 | .init_early = am3517_crane_init_early, |