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
/
kernel
/
irq-rm9000.c
diff --git
a/arch/mips/kernel/irq-rm9000.c
b/arch/mips/kernel/irq-rm9000.c
index
62f011b
..
9b5f20c
100644
(file)
--- a/
arch/mips/kernel/irq-rm9000.c
+++ b/
arch/mips/kernel/irq-rm9000.c
@@
-105,7
+105,7
@@
static void rm9k_cpu_irq_end(unsigned int irq)
unmask_rm9k_irq(irq);
}
unmask_rm9k_irq(irq);
}
-static
struct irq_chip
rm9k_irq_controller = {
+static
hw_irq_controller
rm9k_irq_controller = {
.typename = "RM9000",
.startup = rm9k_cpu_irq_startup,
.shutdown = rm9k_cpu_irq_shutdown,
.typename = "RM9000",
.startup = rm9k_cpu_irq_startup,
.shutdown = rm9k_cpu_irq_shutdown,
@@
-115,7
+115,7
@@
static struct irq_chip rm9k_irq_controller = {
.end = rm9k_cpu_irq_end,
};
.end = rm9k_cpu_irq_end,
};
-static
struct irq_chip
rm9k_perfcounter_irq = {
+static
hw_irq_controller
rm9k_perfcounter_irq = {
.typename = "RM9000",
.startup = rm9k_perfcounter_irq_startup,
.shutdown = rm9k_perfcounter_irq_shutdown,
.typename = "RM9000",
.startup = rm9k_perfcounter_irq_startup,
.shutdown = rm9k_perfcounter_irq_shutdown,
@@
-139,11
+139,11
@@
void __init rm9k_cpu_irq_init(int base)
irq_desc[i].status = IRQ_DISABLED;
irq_desc[i].action = NULL;
irq_desc[i].depth = 1;
irq_desc[i].status = IRQ_DISABLED;
irq_desc[i].action = NULL;
irq_desc[i].depth = 1;
- irq_desc[i].
chip
= &rm9k_irq_controller;
+ irq_desc[i].
handler
= &rm9k_irq_controller;
}
rm9000_perfcount_irq = base + 1;
}
rm9000_perfcount_irq = base + 1;
- irq_desc[rm9000_perfcount_irq].
chip
= &rm9k_perfcounter_irq;
+ irq_desc[rm9000_perfcount_irq].
handler
= &rm9k_perfcounter_irq;
irq_base = base;
}
irq_base = base;
}