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-cm-t3517.c | |
| parent | 8efc59ad6764ade520012cb192cd484e5191cd9c (diff) | |
| parent | c825dda905bac330c2da7fabdf5c0ac28758b3cd (diff) | |
Merge branch 'depends/rmk/devel-stable' into next/cleanup
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 867bf671719c..3f4dc6626845 100644 --- a/arch/arm/mach-omap2/board-cm-t3517.c +++ b/arch/arm/mach-omap2/board-cm-t3517.c | |||
| @@ -294,7 +294,7 @@ static void __init cm_t3517_init(void) | |||
| 294 | } | 294 | } |
| 295 | 295 | ||
| 296 | MACHINE_START(CM_T3517, "Compulab CM-T3517") | 296 | MACHINE_START(CM_T3517, "Compulab CM-T3517") |
| 297 | .boot_params = 0x80000100, | 297 | .atag_offset = 0x100, |
| 298 | .reserve = omap_reserve, | 298 | .reserve = omap_reserve, |
| 299 | .map_io = omap3_map_io, | 299 | .map_io = omap3_map_io, |
| 300 | .init_early = am35xx_init_early, | 300 | .init_early = am35xx_init_early, |