Merge branch 'integrator/irq' into next/soc
Picking up one compilation warning fix for integrator.
From Linus Walleij:
* integrator/irq:
irq: versatile: delete dangling variable
Signed-off-by: Olof Johansson <olof@lixom.net>
diff --git a/drivers/irqchip/irq-versatile-fpga.c b/drivers/irqchip/irq-versatile-fpga.c
index 789b3e5..9dbd82b 100644
--- a/drivers/irqchip/irq-versatile-fpga.c
+++ b/drivers/irqchip/irq-versatile-fpga.c
@@ -177,7 +177,6 @@
int __init fpga_irq_of_init(struct device_node *node,
struct device_node *parent)
{
- struct fpga_irq_data *f;
void __iomem *base;
u32 clear_mask;
u32 valid_mask;