Merge git://git.infradead.org/battery-2.6

[sfrench/cifs-2.6.git] / arch / arm / common / gic.c

diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
index 664c7b8b1ba87d7d5268c661808636a27b4f610c..337741f734ac08d7f438e5d6240293adf3c5c366 100644 (file)
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@ -117,7 +117,7 @@ static int gic_set_cpu(unsigned int irq, const struct cpumask *mask_val)
        u32 val;
 
        spin_lock(&irq_controller_lock);
-       irq_desc[irq].cpu = cpu;
+       irq_desc[irq].node = cpu;
        val = readl(reg) & ~(0xff << shift);
        val |= 1 << (cpu + shift);
        writel(val, reg);