diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-07 09:16:35 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-07 09:16:35 -0400 |
| commit | ad73c67e792c752ddc99f2b0587abae05255dd6d (patch) | |
| tree | e33d5d37a8c56b6fad753fa2d481f43cfb60ae1d /arch/arm/kernel/ecard.c | |
| parent | 08eac93a689ca05c7b7413f6d362c7d38b5fd5b1 (diff) | |
| parent | 9f737633e6ee54fc174282d49b2559bd2208391d (diff) | |
Merge branch 'master'
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, |