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 tag 'r8169-20060920-00' of git://electric-eye.fr.zoreil.com/home/romieu/linux...
[pandora-kernel.git]
/
arch
/
arm
/
mach-lh7a40x
/
arch-lpd7a40x.c
diff --git
a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
index
35c3606
..
a691011
100644
(file)
--- a/
arch/arm/mach-lh7a40x/arch-lpd7a40x.c
+++ b/
arch/arm/mach-lh7a40x/arch-lpd7a40x.c
@@
-200,7
+200,8
@@
static void lh7a40x_unmask_cpld_irq (u32 irq)
}
}
-static struct irqchip lpd7a40x_cpld_chip = {
+static struct irq_chip lpd7a40x_cpld_chip = {
+ .name = "CPLD",
.ack = lh7a40x_ack_cpld_irq,
.mask = lh7a40x_mask_cpld_irq,
.unmask = lh7a40x_unmask_cpld_irq,