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/kernel/ecard.c | |
| parent | 73c1ac1e3b6c989b9b5f7b2313ac590a1c3b6d6a (diff) | |
| parent | efe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48 (diff) | |
Merge branch 'from-linus' into upstream
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, |