aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/irq.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-10 23:10:10 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-10 23:10:10 +0100
commit59aaade72544ad1be4183c1066c20b5883a78717 (patch)
treeda57c3029145c21b5eae457fbd66b997b503f155 /arch/arm/mach-omap2/irq.c
parent8e5bdc44ba82d1f75c8732c2c2b64a22bb622e8f (diff)
parent99b3075b9095c23acf8d884bdc7fe33c8c3520f0 (diff)
Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into omap-all
Diffstat (limited to 'arch/arm/mach-omap2/irq.c')
-rw-r--r--arch/arm/mach-omap2/irq.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
index c39e26dc5ee..d354e0fe447 100644
--- a/arch/arm/mach-omap2/irq.c
+++ b/arch/arm/mach-omap2/irq.c
@@ -128,6 +128,8 @@ void __init omap_init_irq(void)
if (cpu_is_omap24xx())
bank->base_reg = OMAP2_IO_ADDRESS(OMAP24XX_IC_BASE);
+ else if (cpu_is_omap34xx())
+ bank->base_reg = OMAP2_IO_ADDRESS(OMAP34XX_IC_BASE);
omap_irq_bank_init_one(bank);