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-omap2/board-generic.c | |
| parent | 7e788b4289bb025a96e327c604cb2db92e17108f (diff) | |
| parent | 869fef41547db95df8523bf67845a21313709428 (diff) | |
Merge branch 'devel-map-io' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-generic.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 9a7f790d8c3a..3482b99e8c86 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
| @@ -58,6 +58,7 @@ MACHINE_START(OMAP_GENERIC, "Generic OMAP24xx") | |||
| 58 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, | 58 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, |
| 59 | .boot_params = 0x80000100, | 59 | .boot_params = 0x80000100, |
| 60 | .map_io = omap_generic_map_io, | 60 | .map_io = omap_generic_map_io, |
| 61 | .reserve = omap_reserve, | ||
| 61 | .init_irq = omap_generic_init_irq, | 62 | .init_irq = omap_generic_init_irq, |
| 62 | .init_machine = omap_generic_init, | 63 | .init_machine = omap_generic_init, |
| 63 | .timer = &omap_timer, | 64 | .timer = &omap_timer, |