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
/
cris
/
arch-v10
/
kernel
/
irq.c
diff --git
a/arch/cris/arch-v10/kernel/irq.c
b/arch/cris/arch-v10/kernel/irq.c
index
4b368a1
..
96094cb
100644
(file)
--- a/
arch/cris/arch-v10/kernel/irq.c
+++ b/
arch/cris/arch-v10/kernel/irq.c
@@
-15,7
+15,6
@@
#include <linux/irq.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/irq.h>
#include <linux/kernel.h>
#include <linux/init.h>
-#include <linux/config.h>
#define mask_irq(irq_nr) (*R_VECT_MASK_CLR = 1 << (irq_nr));
#define unmask_irq(irq_nr) (*R_VECT_MASK_SET = 1 << (irq_nr));
#define mask_irq(irq_nr) (*R_VECT_MASK_CLR = 1 << (irq_nr));
#define unmask_irq(irq_nr) (*R_VECT_MASK_SET = 1 << (irq_nr));
@@
-172,7
+171,7
@@
init_IRQ(void)
/* Initialize IRQ handler descriptiors. */
for(i = 2; i < NR_IRQS; i++) {
/* Initialize IRQ handler descriptiors. */
for(i = 2; i < NR_IRQS; i++) {
- irq_desc[i].
handler
= &crisv10_irq_type;
+ irq_desc[i].
chip
= &crisv10_irq_type;
set_int_vector(i, interrupt[i]);
}
set_int_vector(i, interrupt[i]);
}