diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-12-03 02:38:13 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-12-03 02:38:13 -0500 |
| commit | 467832032cc07626880363efa8625719c16c04eb (patch) | |
| tree | ee9a62c04f0b3106e412bc1b2dd1cea5566d5ca7 /arch/alpha/kernel/sys_takara.c | |
| parent | 66d2a5952eab875f1286e04f738ef029afdaf013 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge commit 'v2.6.32' into next
Diffstat (limited to 'arch/alpha/kernel/sys_takara.c')
| -rw-r--r-- | arch/alpha/kernel/sys_takara.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/sys_takara.c b/arch/alpha/kernel/sys_takara.c index 830318c21661..230464885b5c 100644 --- a/arch/alpha/kernel/sys_takara.c +++ b/arch/alpha/kernel/sys_takara.c | |||
| @@ -75,7 +75,7 @@ takara_end_irq(unsigned int irq) | |||
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | static struct irq_chip takara_irq_type = { | 77 | static struct irq_chip takara_irq_type = { |
| 78 | .typename = "TAKARA", | 78 | .name = "TAKARA", |
| 79 | .startup = takara_startup_irq, | 79 | .startup = takara_startup_irq, |
| 80 | .shutdown = takara_disable_irq, | 80 | .shutdown = takara_disable_irq, |
| 81 | .enable = takara_enable_irq, | 81 | .enable = takara_enable_irq, |