[IA64] Support multiple CPUs going through OS_MCA

[sfrench/cifs-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 0029f0008deac076d76a5c9dcbf27704671b4aab..de1a31ee52f3458d166771457ef287a5eab16158 100644 (file)
--- a/arch/mips/momentum/ocelot_c/uart-irq.c
+++ b/arch/mips/momentum/ocelot_c/uart-irq.c
@@ -59,15 +59,6 @@ static inline void unmask_uart_irq(unsigned int irq)
        value = OCELOT_FPGA_READ(UART_INTMASK);
 }
 
-/*
- * End IRQ processing
- */
-static void end_uart_irq(unsigned int irq)
-{
-       if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-               unmask_uart_irq(irq);
-}
-
 /*
  * Interrupt handler for interrupts coming from the FPGA chip.
  */
@@ -86,12 +77,11 @@ void ll_uart_irq(void)
 }
 
 struct irq_chip uart_irq_type = {
-       .typename = "UART/FPGA",
+       .name = "UART/FPGA",
        .ack = mask_uart_irq,
        .mask = mask_uart_irq,
        .mask_ack = mask_uart_irq,
        .unmask = unmask_uart_irq,
-       .end = end_uart_irq,
 };
 
 void uart_irq_init(void)