diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:04:15 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:06:24 -0500 |
| commit | a7790532f5b7358c33a6b1834dc2b318de209f31 (patch) | |
| tree | 0ceb9e24b3f54cb5c8453fb5a218e2a94a0f1cce /arch/mips/sni/a20r.c | |
| parent | 2764fb4244cc1bc08df3667924ca4a972e90ac70 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
The SmartMedia FTL code depends on new kfifo bits from 2.6.33
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, |