diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
| commit | 115b384cf87249d76adb0b21aca11ee22128927d (patch) | |
| tree | f39a2a54863e9d82d1196906f92c82ab5991c6af /arch/arm/kernel/ecard.c | |
| parent | 8eb7925f93af75e66a240d148efdec212f95bcb7 (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
Diffstat (limited to 'arch/arm/kernel/ecard.c')
| -rw-r--r-- | arch/arm/kernel/ecard.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c index b9a74a741d00..eca248d9eba4 100644 --- a/arch/arm/kernel/ecard.c +++ b/arch/arm/kernel/ecard.c | |||
| @@ -470,7 +470,8 @@ static void ecard_irq_mask(unsigned int irqnr) | |||
| 470 | } | 470 | } |
| 471 | } | 471 | } |
| 472 | 472 | ||
| 473 | static struct irqchip ecard_chip = { | 473 | static struct irq_chip ecard_chip = { |
| 474 | .name = "ECARD", | ||
| 474 | .ack = ecard_irq_mask, | 475 | .ack = ecard_irq_mask, |
| 475 | .mask = ecard_irq_mask, | 476 | .mask = ecard_irq_mask, |
| 476 | .unmask = ecard_irq_unmask, | 477 | .unmask = ecard_irq_unmask, |