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
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
arch
/
mips
/
vr41xx
/
common
/
irq.c
diff --git
a/arch/mips/vr41xx/common/irq.c
b/arch/mips/vr41xx/common/irq.c
index
4733c53
..
86796bb
100644
(file)
--- a/
arch/mips/vr41xx/common/irq.c
+++ b/
arch/mips/vr41xx/common/irq.c
@@
-22,7
+22,7
@@
#include <asm/irq_cpu.h>
#include <asm/system.h>
#include <asm/irq_cpu.h>
#include <asm/system.h>
-#include <asm/vr41xx/
irq
.h>
+#include <asm/vr41xx/
vr41xx
.h>
typedef struct irq_cascade {
int (*get_irq)(unsigned int, struct pt_regs *);
typedef struct irq_cascade {
int (*get_irq)(unsigned int, struct pt_regs *);
@@
-62,7
+62,7
@@
EXPORT_SYMBOL_GPL(cascade_irq);
static void irq_dispatch(unsigned int irq, struct pt_regs *regs)
{
irq_cascade_t *cascade;
static void irq_dispatch(unsigned int irq, struct pt_regs *regs)
{
irq_cascade_t *cascade;
-
struct irq_desc
*desc;
+
irq_desc_t
*desc;
if (irq >= NR_IRQS) {
atomic_inc(&irq_err_count);
if (irq >= NR_IRQS) {
atomic_inc(&irq_err_count);
@@
-73,13
+73,13
@@
static void irq_dispatch(unsigned int irq, struct pt_regs *regs)
if (cascade->get_irq != NULL) {
unsigned int source_irq = irq;
desc = irq_desc + source_irq;
if (cascade->get_irq != NULL) {
unsigned int source_irq = irq;
desc = irq_desc + source_irq;
- desc->
chip
->ack(source_irq);
+ desc->
handler
->ack(source_irq);
irq = cascade->get_irq(irq, regs);
if (irq < 0)
atomic_inc(&irq_err_count);
else
irq_dispatch(irq, regs);
irq = cascade->get_irq(irq, regs);
if (irq < 0)
atomic_inc(&irq_err_count);
else
irq_dispatch(irq, regs);
- desc->
chip
->end(source_irq);
+ desc->
handler
->end(source_irq);
} else
do_IRQ(irq, regs);
}
} else
do_IRQ(irq, regs);
}