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-ams-delta.c | |
| parent | 7e788b4289bb025a96e327c604cb2db92e17108f (diff) | |
| parent | 869fef41547db95df8523bf67845a21313709428 (diff) | |
Merge branch 'devel-map-io' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap1/board-ams-delta.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-ams-delta.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index c6a81ff8c0d8..41992ab71961 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c | |||
| @@ -301,6 +301,7 @@ MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)") | |||
| 301 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, | 301 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
| 302 | .boot_params = 0x10000100, | 302 | .boot_params = 0x10000100, |
| 303 | .map_io = ams_delta_map_io, | 303 | .map_io = ams_delta_map_io, |
| 304 | .reserve = omap_reserve, | ||
| 304 | .init_irq = ams_delta_init_irq, | 305 | .init_irq = ams_delta_init_irq, |
| 305 | .init_machine = ams_delta_init, | 306 | .init_machine = ams_delta_init, |
| 306 | .timer = &omap_timer, | 307 | .timer = &omap_timer, |