diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-01-22 02:55:25 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-01-22 02:55:25 -0500 |
| commit | 7755726fe90a8b253659756e6de68c1a55aa427f (patch) | |
| tree | a3523fa77e07854db3b8089e3066a55ea997060c /arch/mips/sni/pcimt.c | |
| parent | 3bf127637e22ddf95e67e10a23c339cee3d52429 (diff) | |
| parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
Merge commit 'v2.6.33-rc5' into next
Diffstat (limited to 'arch/mips/sni/pcimt.c')
| -rw-r--r-- | arch/mips/sni/pcimt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/sni/pcimt.c b/arch/mips/sni/pcimt.c index 74e6c67982fb..51e62bbaa23b 100644 --- a/arch/mips/sni/pcimt.c +++ b/arch/mips/sni/pcimt.c | |||
| @@ -214,7 +214,7 @@ static void end_pcimt_irq(unsigned int irq) | |||
| 214 | } | 214 | } |
| 215 | 215 | ||
| 216 | static struct irq_chip pcimt_irq_type = { | 216 | static struct irq_chip pcimt_irq_type = { |
| 217 | .typename = "PCIMT", | 217 | .name = "PCIMT", |
| 218 | .ack = disable_pcimt_irq, | 218 | .ack = disable_pcimt_irq, |
| 219 | .mask = disable_pcimt_irq, | 219 | .mask = disable_pcimt_irq, |
| 220 | .mask_ack = disable_pcimt_irq, | 220 | .mask_ack = disable_pcimt_irq, |