diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-04 14:24:15 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-04 14:24:15 -0400 |
| commit | 71bfe47f023c55c322607939b786ce0a44627dfc (patch) | |
| tree | f59c37feb00f1df2e0f4ec282ae9c80ad6bb0cdc /arch/arm/common/vic.c | |
| parent | 73c1ac1e3b6c989b9b5f7b2313ac590a1c3b6d6a (diff) | |
| parent | efe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48 (diff) | |
Merge branch 'from-linus' into upstream
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, |