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/pcit.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/pcit.c')
| -rw-r--r-- | arch/mips/sni/pcit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/sni/pcit.c b/arch/mips/sni/pcit.c index 071a9573ac7f..f4699d35858b 100644 --- a/arch/mips/sni/pcit.c +++ b/arch/mips/sni/pcit.c | |||
| @@ -176,7 +176,7 @@ void end_pcit_irq(unsigned int irq) | |||
| 176 | } | 176 | } |
| 177 | 177 | ||
| 178 | static struct irq_chip pcit_irq_type = { | 178 | static struct irq_chip pcit_irq_type = { |
| 179 | .typename = "PCIT", | 179 | .name = "PCIT", |
| 180 | .ack = disable_pcit_irq, | 180 | .ack = disable_pcit_irq, |
| 181 | .mask = disable_pcit_irq, | 181 | .mask = disable_pcit_irq, |
| 182 | .mask_ack = disable_pcit_irq, | 182 | .mask_ack = disable_pcit_irq, |