diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 15:44:10 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 15:44:10 -0400 |
| commit | 6c59c115b0f295434cc4f917d180fecd84d39f81 (patch) | |
| tree | 659a2b63552dd53211f86c60930900520cba3686 /arch/arm/mach-omap2/board-generic.c | |
| parent | 3a6cb8ce07d994f6e4a3679c5478d0f18b6b86c4 (diff) | |
| parent | 257d643d7d7cd81075b6dee88cfba14f773805c7 (diff) | |
Merge branch 'omap/4460' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/soc
Diffstat (limited to 'arch/arm/mach-omap2/board-generic.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 73e3c31e8508..c6ecf607ebd6 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
| @@ -70,7 +70,7 @@ MACHINE_START(OMAP_GENERIC, "Generic OMAP24xx") | |||
| 70 | .reserve = omap_reserve, | 70 | .reserve = omap_reserve, |
| 71 | .map_io = omap_generic_map_io, | 71 | .map_io = omap_generic_map_io, |
| 72 | .init_early = omap_generic_init_early, | 72 | .init_early = omap_generic_init_early, |
| 73 | .init_irq = omap_init_irq, | 73 | .init_irq = omap2_init_irq, |
| 74 | .init_machine = omap_generic_init, | 74 | .init_machine = omap_generic_init, |
| 75 | .timer = &omap_timer, | 75 | .timer = &omap3_timer, |
| 76 | MACHINE_END | 76 | MACHINE_END |