diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-08 03:09:11 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-08 03:09:11 -0400 |
| commit | 32bc6e095d75233e7c87cc6fa0e07942b124d194 (patch) | |
| tree | 8f83ef9a23d52d1305878b65dd98fc22b09b7f3e /arch/arm/mach-at91rm9200/irq.c | |
| parent | 5cf13911b1e72707b6f0eb39b2d819ec6e343d76 (diff) | |
| parent | 81b73dd92b97423b8f5324a59044da478c04f4c4 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/arm/mach-at91rm9200/irq.c')
| -rw-r--r-- | arch/arm/mach-at91rm9200/irq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-at91rm9200/irq.c b/arch/arm/mach-at91rm9200/irq.c index 9b0911320417..c3a5e777f9f8 100644 --- a/arch/arm/mach-at91rm9200/irq.c +++ b/arch/arm/mach-at91rm9200/irq.c | |||
| @@ -114,7 +114,8 @@ void at91_irq_resume(void) | |||
| 114 | #define at91_aic_set_wake NULL | 114 | #define at91_aic_set_wake NULL |
| 115 | #endif | 115 | #endif |
| 116 | 116 | ||
| 117 | static struct irqchip at91_aic_chip = { | 117 | static struct irq_chip at91_aic_chip = { |
| 118 | .name = "AIC", | ||
| 118 | .ack = at91_aic_mask_irq, | 119 | .ack = at91_aic_mask_irq, |
| 119 | .mask = at91_aic_mask_irq, | 120 | .mask = at91_aic_mask_irq, |
| 120 | .unmask = at91_aic_unmask_irq, | 121 | .unmask = at91_aic_unmask_irq, |