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
/
jmr3927
/
rbhma3100
/
irq.c
diff --git
a/arch/mips/jmr3927/rbhma3100/irq.c
b/arch/mips/jmr3927/rbhma3100/irq.c
index
7221744
..
11304d1
100644
(file)
--- a/
arch/mips/jmr3927/rbhma3100/irq.c
+++ b/
arch/mips/jmr3927/rbhma3100/irq.c
@@
-29,6
+29,7
@@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <linux/config.h>
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/errno.h>
@@
-416,7
+417,7
@@
void __init arch_init_irq(void)
set_c0_status(ST0_IM); /* IE bit is still 0. */
}
set_c0_status(ST0_IM); /* IE bit is still 0. */
}
-static
struct irq_chip
jmr3927_irq_controller = {
+static
hw_irq_controller
jmr3927_irq_controller = {
.typename = "jmr3927_irq",
.startup = jmr3927_irq_startup,
.shutdown = jmr3927_irq_shutdown,
.typename = "jmr3927_irq",
.startup = jmr3927_irq_startup,
.shutdown = jmr3927_irq_shutdown,
@@
-434,7
+435,7
@@
void jmr3927_irq_init(u32 irq_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
= &jmr3927_irq_controller;
+ irq_desc[i].
handler
= &jmr3927_irq_controller;
}
jmr3927_irq_base = irq_base;
}
jmr3927_irq_base = irq_base;