diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-20 16:12:47 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-20 16:13:03 -0700 |
| commit | 1ef3f756b069469621a47ded867e71c97e1b483f (patch) | |
| tree | 3e4eeec39cd098b025d24fc47d711eb0bcd265d9 | |
| parent | 25696b4b3541d5f7641b61e6abfda765426834b8 (diff) | |
| parent | 2c2d16745a3a0924e2335722f5a1676a0c501b1f (diff) | |
| download | blackbird-op-linux-1ef3f756b069469621a47ded867e71c97e1b483f.tar.gz blackbird-op-linux-1ef3f756b069469621a47ded867e71c97e1b483f.zip | |
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>
| -rw-r--r-- | drivers/bus/omap_l3_noc.c | 4 |
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; } |
