diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-02 23:21:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-02 23:21:23 -0400 |
| commit | 1398ab7cb92b21d8d5add3bdc25b2c00462cfd5c (patch) | |
| tree | ecfe847dda816361d83b1da6d7213b27721e7fd7 /arch/arm/mach-pxa/lpd270.c | |
| parent | a166222cde740b34d97fe49dca70348197f4534e (diff) | |
| parent | e252630f1fd1d14ac4081e566d2f697ae1779215 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3743/1: ARM: OMAP: Fix compile for OMAP
[ARM] 3739/1: genirq updates: irq_chip, add and use irq_chip.name
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, |