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
/
tx4938
/
common
/
irq.c
diff --git
a/arch/mips/tx4938/common/irq.c
b/arch/mips/tx4938/common/irq.c
index
8738051
..
dc30d66
100644
(file)
--- a/
arch/mips/tx4938/common/irq.c
+++ b/
arch/mips/tx4938/common/irq.c
@@
-57,7
+57,7
@@
DEFINE_SPINLOCK(tx4938_cp0_lock);
DEFINE_SPINLOCK(tx4938_pic_lock);
#define TX4938_CP0_NAME "TX4938-CP0"
DEFINE_SPINLOCK(tx4938_pic_lock);
#define TX4938_CP0_NAME "TX4938-CP0"
-static struct
hw_interrupt_type
tx4938_irq_cp0_type = {
+static struct
irq_chip
tx4938_irq_cp0_type = {
.typename = TX4938_CP0_NAME,
.startup = tx4938_irq_cp0_startup,
.shutdown = tx4938_irq_cp0_shutdown,
.typename = TX4938_CP0_NAME,
.startup = tx4938_irq_cp0_startup,
.shutdown = tx4938_irq_cp0_shutdown,
@@
-69,7
+69,7
@@
static struct hw_interrupt_type tx4938_irq_cp0_type = {
};
#define TX4938_PIC_NAME "TX4938-PIC"
};
#define TX4938_PIC_NAME "TX4938-PIC"
-static struct
hw_interrupt_type
tx4938_irq_pic_type = {
+static struct
irq_chip
tx4938_irq_pic_type = {
.typename = TX4938_PIC_NAME,
.startup = tx4938_irq_pic_startup,
.shutdown = tx4938_irq_pic_shutdown,
.typename = TX4938_PIC_NAME,
.startup = tx4938_irq_pic_startup,
.shutdown = tx4938_irq_pic_shutdown,
@@
-102,7
+102,7
@@
tx4938_irq_cp0_init(void)
irq_desc[i].status = IRQ_DISABLED;
irq_desc[i].action = 0;
irq_desc[i].depth = 1;
irq_desc[i].status = IRQ_DISABLED;
irq_desc[i].action = 0;
irq_desc[i].depth = 1;
- irq_desc[i].
handler
= &tx4938_irq_cp0_type;
+ irq_desc[i].
chip
= &tx4938_irq_cp0_type;
}
return;
}
return;
@@
-306,7
+306,7
@@
tx4938_irq_pic_init(void)
irq_desc[i].status = IRQ_DISABLED;
irq_desc[i].action = 0;
irq_desc[i].depth = 2;
irq_desc[i].status = IRQ_DISABLED;
irq_desc[i].action = 0;
irq_desc[i].depth = 2;
- irq_desc[i].
handler
= &tx4938_irq_pic_type;
+ irq_desc[i].
chip
= &tx4938_irq_pic_type;
}
setup_irq(TX4938_IRQ_NEST_PIC_ON_CP0, &tx4938_irq_pic_action);
}
setup_irq(TX4938_IRQ_NEST_PIC_ON_CP0, &tx4938_irq_pic_action);