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-htcherald.c | |
| parent | 7e788b4289bb025a96e327c604cb2db92e17108f (diff) | |
| parent | 869fef41547db95df8523bf67845a21313709428 (diff) | |
Merge branch 'devel-map-io' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap1/board-htcherald.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-htcherald.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c index 736e4c2064f..311899ff5ff 100644 --- a/arch/arm/mach-omap1/board-htcherald.c +++ b/arch/arm/mach-omap1/board-htcherald.c | |||
| @@ -304,6 +304,7 @@ MACHINE_START(HERALD, "HTC Herald") | |||
| 304 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, | 304 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
| 305 | .boot_params = 0x10000100, | 305 | .boot_params = 0x10000100, |
| 306 | .map_io = htcherald_map_io, | 306 | .map_io = htcherald_map_io, |
| 307 | .reserve = omap_reserve, | ||
| 307 | .init_irq = htcherald_init_irq, | 308 | .init_irq = htcherald_init_irq, |
| 308 | .init_machine = htcherald_init, | 309 | .init_machine = htcherald_init, |
| 309 | .timer = &omap_timer, | 310 | .timer = &omap_timer, |