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/a20r.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/a20r.c')
| -rw-r--r-- | arch/mips/sni/a20r.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/sni/a20r.c b/arch/mips/sni/a20r.c index 7dd76fb3b645..e6980892834a 100644 --- a/arch/mips/sni/a20r.c +++ b/arch/mips/sni/a20r.c | |||
| @@ -188,7 +188,7 @@ static void end_a20r_irq(unsigned int irq) | |||
| 188 | } | 188 | } |
| 189 | 189 | ||
| 190 | static struct irq_chip a20r_irq_type = { | 190 | static struct irq_chip a20r_irq_type = { |
| 191 | .typename = "A20R", | 191 | .name = "A20R", |
| 192 | .ack = mask_a20r_irq, | 192 | .ack = mask_a20r_irq, |
| 193 | .mask = mask_a20r_irq, | 193 | .mask = mask_a20r_irq, |
| 194 | .mask_ack = mask_a20r_irq, | 194 | .mask_ack = mask_a20r_irq, |