diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/mips/sni/pcimt.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
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, |