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
/
arch-kev7a400.c
diff --git
a/arch/arm/mach-lh7a40x/arch-kev7a400.c
b/arch/arm/mach-lh7a40x/arch-kev7a400.c
index
2cccc27
..
4f2ab48
100644
(file)
--- a/
arch/arm/mach-lh7a40x/arch-kev7a400.c
+++ b/
arch/arm/mach-lh7a40x/arch-kev7a400.c
@@
-63,7
+63,8
@@
static void kev7a400_unmask_cpld_irq (u32 irq)
CPLD_WR_PB_INT_MASK = CPLD_IRQ_mask;
}
CPLD_WR_PB_INT_MASK = CPLD_IRQ_mask;
}
-static struct irqchip kev7a400_cpld_chip = {
+static struct irq_chip kev7a400_cpld_chip = {
+ .name = "CPLD",
.ack = kev7a400_ack_cpld_irq,
.mask = kev7a400_mask_cpld_irq,
.unmask = kev7a400_unmask_cpld_irq,
.ack = kev7a400_ack_cpld_irq,
.mask = kev7a400_mask_cpld_irq,
.unmask = kev7a400_unmask_cpld_irq,