diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:00:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:00:53 -0400 |
| commit | 1077682b2f97cee76a79cf38bab3fa022a97d9f8 (patch) | |
| tree | e0e7dff35e3f38b9e360e702903e132c991f3f22 /arch/arm/mach-ixp4xx/common.c | |
| parent | dc9ca2af4917ce4e545fa3eb1d845c555128cabc (diff) | |
| parent | bafa49cc1b800df4748b29e2b038ff029d7c8747 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-ixp4xx/common.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/common.c | 16 |
1 files changed, 8 insertions, 8 deletions
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) |