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-osk.c | |
| parent | 7e788b4289bb025a96e327c604cb2db92e17108f (diff) | |
| parent | 869fef41547db95df8523bf67845a21313709428 (diff) | |
Merge branch 'devel-map-io' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap1/board-osk.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-osk.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index b28c46a9ecce..679740cc1e90 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c | |||
| @@ -584,6 +584,7 @@ MACHINE_START(OMAP_OSK, "TI-OSK") | |||
| 584 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, | 584 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
| 585 | .boot_params = 0x10000100, | 585 | .boot_params = 0x10000100, |
| 586 | .map_io = osk_map_io, | 586 | .map_io = osk_map_io, |
| 587 | .reserve = omap_reserve, | ||
| 587 | .init_irq = osk_init_irq, | 588 | .init_irq = osk_init_irq, |
| 588 | .init_machine = osk_init, | 589 | .init_machine = osk_init, |
| 589 | .timer = &omap_timer, | 590 | .timer = &omap_timer, |