diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:35:10 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:35:10 +0200 |
| commit | c33d4326b60a3aea5cd070a365043f488f81a3b0 (patch) | |
| tree | 22732738445e6293a15f5408945784d1c2fd7019 /arch/arm/mach-omap1/board-generic.c | |
| parent | fe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff) | |
| parent | 1ad920556f32a5a127397ca461d1a1faaf22c4e0 (diff) | |
Merge branch 'omap/board' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/board
Diffstat (limited to 'arch/arm/mach-omap1/board-generic.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-generic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c index 23f4ab9e265..04fc356c40f 100644 --- a/arch/arm/mach-omap1/board-generic.c +++ b/arch/arm/mach-omap1/board-generic.c @@ -31,7 +31,7 @@ static void __init omap_generic_init_irq(void) { omap1_init_common_hw(); - omap_init_irq(); + omap1_init_irq(); } /* assume no Mini-AB port */ @@ -99,5 +99,5 @@ MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710") .reserve = omap_reserve, .init_irq = omap_generic_init_irq, .init_machine = omap_generic_init, - .timer = &omap_timer, + .timer = &omap1_timer, MACHINE_END |