diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:23:28 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:23:28 -0400 |
| commit | 929f58aeeb46f964d9468ce1addd993f5d92b11d (patch) | |
| tree | 95355731bd4d21d221cdc2a5ab073244ff76db65 /arch/arm/mach-omap1/board-nokia770.c | |
| parent | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff) | |
| parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-omap1/board-nokia770.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-nokia770.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index 5469ce247ffe..6825635ac681 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c | |||
| @@ -264,7 +264,7 @@ static void __init omap_nokia770_map_io(void) | |||
| 264 | } | 264 | } |
| 265 | 265 | ||
| 266 | MACHINE_START(NOKIA770, "Nokia 770") | 266 | MACHINE_START(NOKIA770, "Nokia 770") |
| 267 | .boot_params = 0x10000100, | 267 | .atag_offset = 0x100, |
| 268 | .map_io = omap_nokia770_map_io, | 268 | .map_io = omap_nokia770_map_io, |
| 269 | .reserve = omap_reserve, | 269 | .reserve = omap_reserve, |
| 270 | .init_irq = omap_nokia770_init_irq, | 270 | .init_irq = omap_nokia770_init_irq, |