diff options
Diffstat (limited to 'arch/arm/mach-clps711x/irq.c')
-rw-r--r-- | arch/arm/mach-clps711x/irq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-clps711x/irq.c b/arch/arm/mach-clps711x/irq.c index 7ee926e5bad2..ca102960f528 100644 --- a/arch/arm/mach-clps711x/irq.c +++ b/arch/arm/mach-clps711x/irq.c | |||
@@ -63,7 +63,7 @@ static void int1_unmask(unsigned int irq) | |||
63 | clps_writel(intmr1, INTMR1); | 63 | clps_writel(intmr1, INTMR1); |
64 | } | 64 | } |
65 | 65 | ||
66 | static struct irqchip int1_chip = { | 66 | static struct irq_chip int1_chip = { |
67 | .ack = int1_ack, | 67 | .ack = int1_ack, |
68 | .mask = int1_mask, | 68 | .mask = int1_mask, |
69 | .unmask = int1_unmask, | 69 | .unmask = int1_unmask, |
@@ -100,7 +100,7 @@ static void int2_unmask(unsigned int irq) | |||
100 | clps_writel(intmr2, INTMR2); | 100 | clps_writel(intmr2, INTMR2); |
101 | } | 101 | } |
102 | 102 | ||
103 | static struct irqchip int2_chip = { | 103 | static struct irq_chip int2_chip = { |
104 | .ack = int2_ack, | 104 | .ack = int2_ack, |
105 | .mask = int2_mask, | 105 | .mask = int2_mask, |
106 | .unmask = int2_unmask, | 106 | .unmask = int2_unmask, |
@@ -112,12 +112,12 @@ void __init clps711x_init_irq(void) | |||
112 | 112 | ||
113 | for (i = 0; i < NR_IRQS; i++) { | 113 | for (i = 0; i < NR_IRQS; i++) { |
114 | if (INT1_IRQS & (1 << i)) { | 114 | if (INT1_IRQS & (1 << i)) { |
115 | set_irq_handler(i, do_level_IRQ); | 115 | set_irq_handler(i, handle_level_irq); |
116 | set_irq_chip(i, &int1_chip); | 116 | set_irq_chip(i, &int1_chip); |
117 | set_irq_flags(i, IRQF_VALID | IRQF_PROBE); | 117 | set_irq_flags(i, IRQF_VALID | IRQF_PROBE); |
118 | } | 118 | } |
119 | if (INT2_IRQS & (1 << i)) { | 119 | if (INT2_IRQS & (1 << i)) { |
120 | set_irq_handler(i, do_level_IRQ); | 120 | set_irq_handler(i, handle_level_irq); |
121 | set_irq_chip(i, &int2_chip); | 121 | set_irq_chip(i, &int2_chip); |
122 | set_irq_flags(i, IRQF_VALID | IRQF_PROBE); | 122 | set_irq_flags(i, IRQF_VALID | IRQF_PROBE); |
123 | } | 123 | } |