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-omap2/board-am3517evm.c | |
| parent | 8efc59ad6764ade520012cb192cd484e5191cd9c (diff) | |
| parent | c825dda905bac330c2da7fabdf5c0ac28758b3cd (diff) | |
Merge branch 'depends/rmk/devel-stable' into next/cleanup
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 7d842940c252..65a5912278ac 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, |