diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-27 22:59:59 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-27 22:59:59 -0400 |
| commit | 8ce7a9c159c8c4eb480f0a65c6af753dbf9a1a70 (patch) | |
| tree | be59573c0af3617d0cd8a7d61f0ed119e58b1156 /arch/arm/mach-pxa/lpd270.c | |
| parent | d2afb3ae04e36dbc6e9eb2d8bd54406ff7b6b3bd (diff) | |
| parent | 01da5fd83d6b2c5e36b77539f6cbdd8f49849225 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/arm/mach-pxa/lpd270.c')
| -rw-r--r-- | arch/arm/mach-pxa/lpd270.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c index 1a5f5c21481e..12479ae26db2 100644 --- a/arch/arm/mach-pxa/lpd270.c +++ b/arch/arm/mach-pxa/lpd270.c | |||
| @@ -68,7 +68,8 @@ static void lpd270_unmask_irq(unsigned int irq) | |||
| 68 | __raw_writew(lpd270_irq_enabled, LPD270_INT_MASK); | 68 | __raw_writew(lpd270_irq_enabled, LPD270_INT_MASK); |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | static struct irqchip lpd270_irq_chip = { | 71 | static struct irq_chip lpd270_irq_chip = { |
| 72 | .name = "CPLD", | ||
| 72 | .ack = lpd270_mask_irq, | 73 | .ack = lpd270_mask_irq, |
| 73 | .mask = lpd270_mask_irq, | 74 | .mask = lpd270_mask_irq, |
| 74 | .unmask = lpd270_unmask_irq, | 75 | .unmask = lpd270_unmask_irq, |