diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-08-04 07:43:45 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-08-04 07:43:45 -0400 |
| commit | 7590d1defdc720a97a9e186f45f529c4ae1b40f7 (patch) | |
| tree | e7ffdc043a2847f410d654d8e99e001f3138937a /arch/arm/mach-omap1/board-nokia770.c | |
| parent | 7e788b4289bb025a96e327c604cb2db92e17108f (diff) | |
| parent | 869fef41547db95df8523bf67845a21313709428 (diff) | |
Merge branch 'devel-map-io' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap1/board-nokia770.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-nokia770.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index 5224b67f7f1c..51a4539aecf5 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c | |||
| @@ -266,6 +266,7 @@ MACHINE_START(NOKIA770, "Nokia 770") | |||
| 266 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, | 266 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
| 267 | .boot_params = 0x10000100, | 267 | .boot_params = 0x10000100, |
| 268 | .map_io = omap_nokia770_map_io, | 268 | .map_io = omap_nokia770_map_io, |
| 269 | .reserve = omap_reserve, | ||
| 269 | .init_irq = omap_nokia770_init_irq, | 270 | .init_irq = omap_nokia770_init_irq, |
| 270 | .init_machine = omap_nokia770_init, | 271 | .init_machine = omap_nokia770_init, |
| 271 | .timer = &omap_timer, | 272 | .timer = &omap_timer, |