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>
git-mirror · Nov 30, 2012 · 6e202df · 6e202df
2 parents 011d309 + 07e9f58
commit 6e202df
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/drivers/irqchip/irq-versatile-fpga.c b/drivers/irqchip/irq-versatile-fpga.c
@@ -177,7 +177,6 @@ void __init fpga_irq_init(void __iomem *base, const char *name, int irq_start,
 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;