Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[mirror_ubuntu-artful-kernel.git] / drivers / irqchip / irq-versatile-fpga.c

diff --git a/drivers/irqchip/irq-versatile-fpga.c b/drivers/irqchip/irq-versatile-fpga.c
index cadf104e30746b34d242eaa6e91637b8f99e5370..598ab3f0e0ac54b79f1438c2193f8bc112949975 100644 (file)
--- a/drivers/irqchip/irq-versatile-fpga.c
+++ b/drivers/irqchip/irq-versatile-fpga.c
@@ -210,12 +210,7 @@ int __init fpga_irq_of_init(struct device_node *node,
                parent_irq = -1;
        }
 
-#ifdef CONFIG_ARCH_VERSATILE
-       fpga_irq_init(base, node->name, IRQ_SIC_START, parent_irq, valid_mask,
-                                 node);
-#else
        fpga_irq_init(base, node->name, 0, parent_irq, valid_mask, node);
-#endif
 
        writel(clear_mask, base + IRQ_ENABLE_CLEAR);
        writel(clear_mask, base + FIQ_ENABLE_CLEAR);