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 rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
mips
/
momentum
/
ocelot_c
/
cpci-irq.c
diff --git
a/arch/mips/momentum/ocelot_c/cpci-irq.c
b/arch/mips/momentum/ocelot_c/cpci-irq.c
index
31d179c
..
a5dc230
100644
(file)
--- a/
arch/mips/momentum/ocelot_c/cpci-irq.c
+++ b/
arch/mips/momentum/ocelot_c/cpci-irq.c
@@
-128,7
+128,7
@@
void ll_cpci_irq(struct pt_regs *regs)
#define shutdown_cpci_irq disable_cpci_irq
-struct
hw_interrupt_type
cpci_irq_type = {
+struct
irq_chip
cpci_irq_type = {
.typename = "CPCI/FPGA",
.startup = startup_cpci_irq,
.shutdown = shutdown_cpci_irq,