aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWanlong Gao <wanlong.gao@gmail.com>2011-04-14 15:22:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-14 16:06:55 -0700
commit5de1743e2434fcb24e3d944a20130029b8fe867a (patch)
tree0f3a3cb9b2ee2e58d1df8939cc8ab9783aeab896
parentfc5da22ae35d4720be59af8787a8a6d5e4da9517 (diff)
downloadlinaro-lsk-5de1743e2434fcb24e3d944a20130029b8fe867a.tar.gz
drivers/misc/sgi-gru/grufile.c: fix the wrong members of gru_chip
Fix the wrong members and the wrong function's definition, since the irq_chip had changed. Signed-off-by: Wanlong Gao <wanlong.gao@gmail.com> Cc: Jack Steiner <steiner@sgi.com> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/misc/sgi-gru/grufile.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c
index 20e4e9395b6..ecafa4ba238 100644
--- a/drivers/misc/sgi-gru/grufile.c
+++ b/drivers/misc/sgi-gru/grufile.c
@@ -348,15 +348,15 @@ static unsigned long gru_chiplet_cpu_to_mmr(int chiplet, int cpu, int *corep)
static int gru_irq_count[GRU_CHIPLETS_PER_BLADE];
-static void gru_noop(unsigned int irq)
+static void gru_noop(struct irq_data *d)
{
}
static struct irq_chip gru_chip[GRU_CHIPLETS_PER_BLADE] = {
[0 ... GRU_CHIPLETS_PER_BLADE - 1] {
- .mask = gru_noop,
- .unmask = gru_noop,
- .ack = gru_noop
+ .irq_mask = gru_noop,
+ .irq_unmask = gru_noop,
+ .irq_ack = gru_noop
}
};