Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux-2.6-microblaze.git] / drivers / spi / spi-bcm-qspi.c

diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c
index 85bad70..23d295f 100644 (file)
--- a/drivers/spi/spi-bcm-qspi.c
+++ b/drivers/spi/spi-bcm-qspi.c
@@ -1293,7 +1293,7 @@ int bcm_qspi_probe(struct platform_device *pdev,
                name = qspi_irq_tab[val].irq_name;
                if (qspi_irq_tab[val].irq_source == SINGLE_L2) {
                        /* get the l2 interrupts */
-                       irq = platform_get_irq_byname(pdev, name);
+                       irq = platform_get_irq_byname_optional(pdev, name);
                } else if (!num_ints && soc_intc) {
                        /* all mspi, bspi intrs muxed to one L1 intr */
                        irq = platform_get_irq(pdev, 0);