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-rm680.c | |
| parent | 8efc59ad6764ade520012cb192cd484e5191cd9c (diff) | |
| parent | c825dda905bac330c2da7fabdf5c0ac28758b3cd (diff) | |
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-omap2/board-rm680.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rm680.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c index a98db616e0d4..616fb39763b0 100644 --- a/arch/arm/mach-omap2/board-rm680.c +++ b/arch/arm/mach-omap2/board-rm680.c | |||
| @@ -144,7 +144,7 @@ static void __init rm680_init(void) | |||
| 144 | } | 144 | } |
| 145 | 145 | ||
| 146 | MACHINE_START(NOKIA_RM680, "Nokia RM-680 board") | 146 | MACHINE_START(NOKIA_RM680, "Nokia RM-680 board") |
| 147 | .boot_params = 0x80000100, | 147 | .atag_offset = 0x100, |
| 148 | .reserve = omap_reserve, | 148 | .reserve = omap_reserve, |
| 149 | .map_io = omap3_map_io, | 149 | .map_io = omap3_map_io, |
| 150 | .init_early = omap3630_init_early, | 150 | .init_early = omap3630_init_early, |