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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[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
11304d1
..
7221744
100644
(file)
--- a/
arch/mips/jmr3927/rbhma3100/irq.c
+++ b/
arch/mips/jmr3927/rbhma3100/irq.c
@@
-29,7
+29,6
@@
* 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>
@@
-417,7
+416,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
hw_irq_controller
jmr3927_irq_controller = {
+static
struct irq_chip
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,
@@
-435,7
+434,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].
handler
= &jmr3927_irq_controller;
+ irq_desc[i].
chip
= &jmr3927_irq_controller;
}
jmr3927_irq_base = irq_base;
}
jmr3927_irq_base = irq_base;