diff options
Diffstat (limited to 'arch/arm/mach-h720x/cpu-h7202.c')
-rw-r--r-- | arch/arm/mach-h720x/cpu-h7202.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-h720x/cpu-h7202.c b/arch/arm/mach-h720x/cpu-h7202.c index 06fecaefd8dc..703870f30adf 100644 --- a/arch/arm/mach-h720x/cpu-h7202.c +++ b/arch/arm/mach-h720x/cpu-h7202.c | |||
@@ -106,7 +106,7 @@ static struct platform_device *devices[] __initdata = { | |||
106 | * we have to handle all timer interrupts in one place. | 106 | * we have to handle all timer interrupts in one place. |
107 | */ | 107 | */ |
108 | static void | 108 | static void |
109 | h7202_timerx_demux_handler(unsigned int irq_unused, struct irqdesc *desc) | 109 | h7202_timerx_demux_handler(unsigned int irq_unused, struct irq_desc *desc) |
110 | { | 110 | { |
111 | unsigned int mask, irq; | 111 | unsigned int mask, irq; |
112 | 112 | ||
@@ -162,7 +162,7 @@ static void inline unmask_timerx_irq (u32 irq) | |||
162 | CPU_REG (TIMER_VIRT, TIMER_TOPCTRL) |= bit; | 162 | CPU_REG (TIMER_VIRT, TIMER_TOPCTRL) |= bit; |
163 | } | 163 | } |
164 | 164 | ||
165 | static struct irqchip h7202_timerx_chip = { | 165 | static struct irq_chip h7202_timerx_chip = { |
166 | .ack = mask_timerx_irq, | 166 | .ack = mask_timerx_irq, |
167 | .mask = mask_timerx_irq, | 167 | .mask = mask_timerx_irq, |
168 | .unmask = unmask_timerx_irq, | 168 | .unmask = unmask_timerx_irq, |
@@ -202,7 +202,7 @@ void __init h7202_init_irq (void) | |||
202 | irq < IRQ_CHAINED_TIMERX(NR_TIMERX_IRQS); irq++) { | 202 | irq < IRQ_CHAINED_TIMERX(NR_TIMERX_IRQS); irq++) { |
203 | mask_timerx_irq(irq); | 203 | mask_timerx_irq(irq); |
204 | set_irq_chip(irq, &h7202_timerx_chip); | 204 | set_irq_chip(irq, &h7202_timerx_chip); |
205 | set_irq_handler(irq, do_edge_IRQ); | 205 | set_irq_handler(irq, handle_edge_irq); |
206 | set_irq_flags(irq, IRQF_VALID ); | 206 | set_irq_flags(irq, IRQF_VALID ); |
207 | } | 207 | } |
208 | set_irq_chained_handler(IRQ_TIMERX, h7202_timerx_demux_handler); | 208 | set_irq_chained_handler(IRQ_TIMERX, h7202_timerx_demux_handler); |