summaryrefslogtreecommitdiffstats
path: root/drivers/bus
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-09-20 16:10:02 -0700
committerOlof Johansson <olof@lixom.net>2012-09-20 16:12:36 -0700
commit2c2d16745a3a0924e2335722f5a1676a0c501b1f (patch)
tree484083ef000b9ed35f9ba4561b426df5b2e5e9f8 /drivers/bus
parent0ee7261c9212dbaf72d510e37f6c5b849d1847f0 (diff)
downloadlinux-2c2d16745a3a0924e2335722f5a1676a0c501b1f.tar.gz
linux-2c2d16745a3a0924e2335722f5a1676a0c501b1f.tar.bz2
linux-2c2d16745a3a0924e2335722f5a1676a0c501b1f.zip
drivers: bus: omap_l3: use resources instead of hardcoded irqs
This fixes up a merge conflict due to the move of the driver and cleanups of platform data around the same time. Moving to the resource is what we want anyway, so do it in this branch. Signed-off-by: Arnd Bergmann <arnd@arndb.de> [olof: rewrote with this branch as base, same end result] Signed-off-by: Olof Johansson <olof@lixom.net> Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Diffstat (limited to 'drivers/bus')
-rw-r--r--drivers/bus/omap_l3_noc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bus/omap_l3_noc.c b/drivers/bus/omap_l3_noc.c
index d15225ff5c49..ab911a33f8a8 100644
--- a/drivers/bus/omap_l3_noc.c
+++ b/drivers/bus/omap_l3_noc.c
@@ -190,7 +190,7 @@ static int __devinit omap4_l3_probe(struct platform_device *pdev)
IRQF_DISABLED, "l3-dbg-irq", l3);
if (ret) {
pr_crit("L3: request_irq failed to register for 0x%x\n",
- OMAP44XX_IRQ_L3_DBG);
+ l3->debug_irq);
goto err3;
}
@@ -200,7 +200,7 @@ static int __devinit omap4_l3_probe(struct platform_device *pdev)
IRQF_DISABLED, "l3-app-irq", l3);
if (ret) {
pr_crit("L3: request_irq failed to register for 0x%x\n",
- OMAP44XX_IRQ_L3_APP);
+ l3->app_irq);
goto err4;
}