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/common/vic.c | |
| parent | 5cf13911b1e72707b6f0eb39b2d819ec6e343d76 (diff) | |
| parent | 81b73dd92b97423b8f5324a59044da478c04f4c4 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/arm/common/vic.c')
| -rw-r--r-- | arch/arm/common/vic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c index a19bc4a6196d..43d278134521 100644 --- a/arch/arm/common/vic.c +++ b/arch/arm/common/vic.c | |||
| @@ -39,7 +39,8 @@ static void vic_unmask_irq(unsigned int irq) | |||
| 39 | writel(1 << irq, base + VIC_INT_ENABLE); | 39 | writel(1 << irq, base + VIC_INT_ENABLE); |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | static struct irqchip vic_chip = { | 42 | static struct irq_chip vic_chip = { |
| 43 | .name = "VIC", | ||
| 43 | .ack = vic_mask_irq, | 44 | .ack = vic_mask_irq, |
| 44 | .mask = vic_mask_irq, | 45 | .mask = vic_mask_irq, |
| 45 | .unmask = vic_unmask_irq, | 46 | .unmask = vic_unmask_irq, |