diff options
-rw-r--r-- | arch/arm/mach-ixp2000/core.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/common.c | 16 | ||||
-rw-r--r-- | arch/arm/mach-omap1/irq.c | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c index 781d10ae00b7..098c817a7fb8 100644 --- a/arch/arm/mach-ixp2000/core.c +++ b/arch/arm/mach-ixp2000/core.c | |||
@@ -382,7 +382,7 @@ static void ixp2000_GPIO_irq_unmask(unsigned int irq) | |||
382 | static struct irqchip ixp2000_GPIO_irq_chip = { | 382 | static struct irqchip ixp2000_GPIO_irq_chip = { |
383 | .ack = ixp2000_GPIO_irq_mask_ack, | 383 | .ack = ixp2000_GPIO_irq_mask_ack, |
384 | .mask = ixp2000_GPIO_irq_mask, | 384 | .mask = ixp2000_GPIO_irq_mask, |
385 | .unmask = ixp2000_GPIO_irq_unmask | 385 | .unmask = ixp2000_GPIO_irq_unmask, |
386 | .set_type = ixp2000_GPIO_irq_type, | 386 | .set_type = ixp2000_GPIO_irq_type, |
387 | }; | 387 | }; |
388 | 388 | ||
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index 0422e906cc9a..52ad11328e96 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c | |||
@@ -179,17 +179,17 @@ static void ixp4xx_irq_level_unmask(unsigned int irq) | |||
179 | } | 179 | } |
180 | 180 | ||
181 | static struct irqchip ixp4xx_irq_level_chip = { | 181 | static struct irqchip ixp4xx_irq_level_chip = { |
182 | .ack = ixp4xx_irq_mask, | 182 | .ack = ixp4xx_irq_mask, |
183 | .mask = ixp4xx_irq_mask, | 183 | .mask = ixp4xx_irq_mask, |
184 | .unmask = ixp4xx_irq_level_unmask, | 184 | .unmask = ixp4xx_irq_level_unmask, |
185 | .type = ixp4xx_set_irq_type | 185 | .set_type = ixp4xx_set_irq_type, |
186 | }; | 186 | }; |
187 | 187 | ||
188 | static struct irqchip ixp4xx_irq_edge_chip = { | 188 | static struct irqchip ixp4xx_irq_edge_chip = { |
189 | .ack = ixp4xx_irq_ack, | 189 | .ack = ixp4xx_irq_ack, |
190 | .mask = ixp4xx_irq_mask, | 190 | .mask = ixp4xx_irq_mask, |
191 | .unmask = ixp4xx_irq_unmask, | 191 | .unmask = ixp4xx_irq_unmask, |
192 | .type = ixp4xx_set_irq_type | 192 | .set_type = ixp4xx_set_irq_type, |
193 | }; | 193 | }; |
194 | 194 | ||
195 | static void ixp4xx_config_irq(unsigned irq, enum ixp4xx_irq_type type) | 195 | static void ixp4xx_config_irq(unsigned irq, enum ixp4xx_irq_type type) |
diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c index a11b6d807352..afd5d67e4ae7 100644 --- a/arch/arm/mach-omap1/irq.c +++ b/arch/arm/mach-omap1/irq.c | |||
@@ -165,10 +165,10 @@ static struct omap_irq_bank omap1610_irq_banks[] = { | |||
165 | #endif | 165 | #endif |
166 | 166 | ||
167 | static struct irqchip omap_irq_chip = { | 167 | static struct irqchip omap_irq_chip = { |
168 | .ack = omap_mask_ack_irq, | 168 | .ack = omap_mask_ack_irq, |
169 | .mask = omap_mask_irq, | 169 | .mask = omap_mask_irq, |
170 | .unmask = omap_unmask_irq, | 170 | .unmask = omap_unmask_irq, |
171 | .wake = omap_wake_irq, | 171 | .set_wake = omap_wake_irq, |
172 | }; | 172 | }; |
173 | 173 | ||
174 | void __init omap_init_irq(void) | 174 | void __init omap_init_irq(void) |