summaryrefslogtreecommitdiff
path: root/drivers/irqchip
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-30 22:00:27 +0400
committerOlof Johansson <olof@lixom.net>2012-11-30 22:00:51 +0400
commit6e202df7bdb5cd6ae6a911f57b89e82161f75258 (patch)
tree0e3d153477f18e87eb5bb213dafb8641e1729fe4 /drivers/irqchip
parent011d3090c8dce483c842a4cecf9ae5afe3e29670 (diff)
parent07e9f58703f53b7baf4f9f47bbd2b59320cd504b (diff)
downloadlinux-6e202df7bdb5cd6ae6a911f57b89e82161f75258.tar.xz
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>
Diffstat (limited to 'drivers/irqchip')
-rw-r--r--drivers/irqchip/irq-versatile-fpga.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-versatile-fpga.c b/drivers/irqchip/irq-versatile-fpga.c
index 789b3e526930..9dbd82b716d3 100644
--- 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;