Merge branch 'drivers/ocp2scp' into next/drivers

Pick up one more bugfix

* drivers/ocp2scp:
  drivers: bus: omap_l3: use resources instead of hardcoded irqs

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2012-09-20 16:12:47 -07:00
commit 1ef3f756b0

View file

@ -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;
}