git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
arm
/
mach-lh7a40x
/
irq-lpd7a40x.c
diff --git
a/arch/arm/mach-lh7a40x/irq-lpd7a40x.c
b/arch/arm/mach-lh7a40x/irq-lpd7a40x.c
index
dcb4e17
..
d6055dd
100644
(file)
--- a/
arch/arm/mach-lh7a40x/irq-lpd7a40x.c
+++ b/
arch/arm/mach-lh7a40x/irq-lpd7a40x.c
@@
-50,7
+50,8
@@
static void lh7a40x_unmask_cpld_irq (u32 irq)
}
}
-static struct irqchip lh7a40x_cpld_chip = {
+static struct irq_chip lh7a40x_cpld_chip = {
+ .name = "CPLD",
.ack = lh7a40x_ack_cpld_irq,
.mask = lh7a40x_mask_cpld_irq,
.unmask = lh7a40x_unmask_cpld_irq,