Merge branch 'topic/axi' into for-linus
This commit is contained in:
commit
75abeb6b72
|
@ -687,7 +687,7 @@ static int axi_dmac_probe(struct platform_device *pdev)
|
|||
if (ret)
|
||||
goto err_unregister_device;
|
||||
|
||||
ret = request_irq(dmac->irq, axi_dmac_interrupt_handler, 0,
|
||||
ret = request_irq(dmac->irq, axi_dmac_interrupt_handler, IRQF_SHARED,
|
||||
dev_name(&pdev->dev), dmac);
|
||||
if (ret)
|
||||
goto err_unregister_of;
|
||||
|
|
Loading…
Reference in New Issue