git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-fixes' into upstream
[pandora-kernel.git]
/
arch
/
arm
/
common
/
gic.c
diff --git
a/arch/arm/common/gic.c
b/arch/arm/common/gic.c
index
f3c1ebf
..
f3e020f
100644
(file)
--- a/
arch/arm/common/gic.c
+++ b/
arch/arm/common/gic.c
@@
-95,7
+95,8
@@
static void gic_set_cpu(unsigned int irq, cpumask_t mask_val)
}
#endif
-static struct irqchip gic_chip = {
+static struct irq_chip gic_chip = {
+ .name = "GIC",
.ack = gic_ack_irq,
.mask = gic_mask_irq,
.unmask = gic_unmask_irq,