diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:44:10 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:44:10 +0200 |
commit | 6c59c115b0f295434cc4f917d180fecd84d39f81 (patch) | |
tree | 659a2b63552dd53211f86c60930900520cba3686 /arch/arm/mach-omap2/board-2430sdp.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-2430sdp.c')
-rw-r--r-- | arch/arm/mach-omap2/board-2430sdp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c index 5de6eac0a72..2028464cf5b 100644 --- a/arch/arm/mach-omap2/board-2430sdp.c +++ b/arch/arm/mach-omap2/board-2430sdp.c @@ -260,7 +260,7 @@ MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board") .reserve = omap_reserve, .map_io = omap_2430sdp_map_io, .init_early = omap_2430sdp_init_early, - .init_irq = omap_init_irq, + .init_irq = omap2_init_irq, .init_machine = omap_2430sdp_init, - .timer = &omap_timer, + .timer = &omap2_timer, MACHINE_END |