projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[powerpc.git]
/
arch
/
arm
/
mach-lh7a40x
/
irq-kev7a400.c
diff --git
a/arch/arm/mach-lh7a40x/irq-kev7a400.c
b/arch/arm/mach-lh7a40x/irq-kev7a400.c
index
8535764
..
6460713
100644
(file)
--- a/
arch/arm/mach-lh7a40x/irq-kev7a400.c
+++ b/
arch/arm/mach-lh7a40x/irq-kev7a400.c
@@
-43,21
+43,21
@@
lh7a400_unmask_cpld_irq (u32 irq)
}
static struct
}
static struct
-irqchip lh7a400_cpld_chip = {
+irq_chip lh7a400_cpld_chip = {
+ .name = "CPLD",
.ack = lh7a400_ack_cpld_irq,
.mask = lh7a400_mask_cpld_irq,
.unmask = lh7a400_unmask_cpld_irq,
};
static void
.ack = lh7a400_ack_cpld_irq,
.mask = lh7a400_mask_cpld_irq,
.unmask = lh7a400_unmask_cpld_irq,
};
static void
-lh7a400_cpld_handler (unsigned int irq, struct irqdesc *desc,
- struct pt_regs *regs)
+lh7a400_cpld_handler (unsigned int irq, struct irqdesc *desc)
{
u32 mask = CPLD_LATCHED_INTS;
irq = IRQ_KEV_7A400_CPLD;
for (; mask; mask >>= 1, ++irq) {
if (mask & 1)
{
u32 mask = CPLD_LATCHED_INTS;
irq = IRQ_KEV_7A400_CPLD;
for (; mask; mask >>= 1, ++irq) {
if (mask & 1)
- desc[irq].handle (irq, desc
, regs
);
+ desc[irq].handle (irq, desc);
}
}
}
}