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
/
momentum
/
ocelot_c
/
uart-irq.c
diff --git
a/arch/mips/momentum/ocelot_c/uart-irq.c
b/arch/mips/momentum/ocelot_c/uart-irq.c
index
755bde5
..
9f33d8f
100644
(file)
--- a/
arch/mips/momentum/ocelot_c/uart-irq.c
+++ b/
arch/mips/momentum/ocelot_c/uart-irq.c
@@
-121,7
+121,7
@@
void ll_uart_irq(struct pt_regs *regs)
#define shutdown_uart_irq disable_uart_irq
#define shutdown_uart_irq disable_uart_irq
-struct
hw_interrupt_type
uart_irq_type = {
+struct
irq_chip
uart_irq_type = {
.typename = "UART/FPGA",
.startup = startup_uart_irq,
.shutdown = shutdown_uart_irq,
.typename = "UART/FPGA",
.startup = startup_uart_irq,
.shutdown = shutdown_uart_irq,
@@
-137,10
+137,10
@@
void uart_irq_init(void)
irq_desc[80].status = IRQ_DISABLED;
irq_desc[80].action = 0;
irq_desc[80].depth = 2;
irq_desc[80].status = IRQ_DISABLED;
irq_desc[80].action = 0;
irq_desc[80].depth = 2;
- irq_desc[80].
handler
= &uart_irq_type;
+ irq_desc[80].
chip
= &uart_irq_type;
irq_desc[81].status = IRQ_DISABLED;
irq_desc[81].action = 0;
irq_desc[81].depth = 2;
irq_desc[81].status = IRQ_DISABLED;
irq_desc[81].action = 0;
irq_desc[81].depth = 2;
- irq_desc[81].
handler
= &uart_irq_type;
+ irq_desc[81].
chip
= &uart_irq_type;
}
}