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>
This commit is contained in:
Olof Johansson 2012-11-30 10:00:27 -08:00
commit 6e202df7bd

View File

@ -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;