Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into...

[pandora-kernel.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 ebe1507..8522650 100644 (file)
--- a/arch/mips/momentum/ocelot_c/uart-irq.c
+++ b/arch/mips/momentum/ocelot_c/uart-irq.c
@@ -122,14 +122,13 @@ void ll_uart_irq(struct pt_regs *regs)
 #define shutdown_uart_irq      disable_uart_irq
 
 struct hw_interrupt_type uart_irq_type = {
-       "UART/FPGA",
-       startup_uart_irq,
-       shutdown_uart_irq,
-       enable_uart_irq,
-       disable_uart_irq,
-       mask_and_ack_uart_irq,
-       end_uart_irq,
-       NULL
+       .typename = "UART/FPGA",
+       .startup = startup_uart_irq,
+       .shutdown = shutdown_uart_irq,
+       .enable = enable_uart_irq,
+       .disable = disable_uart_irq,
+       .ack = mask_and_ack_uart_irq,
+       .end = end_uart_irq,
 };
 
 void uart_irq_init(void)
@@ -138,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].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].handler = &uart_irq_type;
+       irq_desc[81].chip = &uart_irq_type;
 }