diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-06-29 06:35:18 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-06-29 06:35:18 -0400 |
| commit | 332acd9e534e0bc8713d2cb90dd2d4d5f2485401 (patch) | |
| tree | 8627f57b3c43f3612c91760292f7e7d1b47eb3d1 /arch/arm/mach-omap2/board-igep0020.c | |
| parent | bafe2721a0fbd1cc1af04384133684f660f3658e (diff) | |
| parent | 0f622e8cae379ee17e1ffe867336b74c5b16f958 (diff) | |
Merge branch 'devel-timer' into devel-cleanup
Diffstat (limited to 'arch/arm/mach-omap2/board-igep0020.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-igep0020.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c index 84d284608333..f683835f936c 100644 --- a/arch/arm/mach-omap2/board-igep0020.c +++ b/arch/arm/mach-omap2/board-igep0020.c | |||
| @@ -706,9 +706,9 @@ MACHINE_START(IGEP0020, "IGEP v2 board") | |||
| 706 | .reserve = omap_reserve, | 706 | .reserve = omap_reserve, |
| 707 | .map_io = omap3_map_io, | 707 | .map_io = omap3_map_io, |
| 708 | .init_early = igep_init_early, | 708 | .init_early = igep_init_early, |
| 709 | .init_irq = omap_init_irq, | 709 | .init_irq = omap3_init_irq, |
| 710 | .init_machine = igep_init, | 710 | .init_machine = igep_init, |
| 711 | .timer = &omap_timer, | 711 | .timer = &omap3_timer, |
| 712 | MACHINE_END | 712 | MACHINE_END |
| 713 | 713 | ||
| 714 | MACHINE_START(IGEP0030, "IGEP OMAP3 module") | 714 | MACHINE_START(IGEP0030, "IGEP OMAP3 module") |
| @@ -716,7 +716,7 @@ MACHINE_START(IGEP0030, "IGEP OMAP3 module") | |||
| 716 | .reserve = omap_reserve, | 716 | .reserve = omap_reserve, |
| 717 | .map_io = omap3_map_io, | 717 | .map_io = omap3_map_io, |
| 718 | .init_early = igep_init_early, | 718 | .init_early = igep_init_early, |
| 719 | .init_irq = omap_init_irq, | 719 | .init_irq = omap3_init_irq, |
| 720 | .init_machine = igep_init, | 720 | .init_machine = igep_init, |
| 721 | .timer = &omap_timer, | 721 | .timer = &omap3_timer, |
| 722 | MACHINE_END | 722 | MACHINE_END |