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_dp264.c | |
| parent | 66d2a5952eab875f1286e04f738ef029afdaf013 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge commit 'v2.6.32' into next
Diffstat (limited to 'arch/alpha/kernel/sys_dp264.c')
| -rw-r--r-- | arch/alpha/kernel/sys_dp264.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/kernel/sys_dp264.c b/arch/alpha/kernel/sys_dp264.c index 46e70ece5176..d64e1e497e76 100644 --- a/arch/alpha/kernel/sys_dp264.c +++ b/arch/alpha/kernel/sys_dp264.c | |||
| @@ -199,7 +199,7 @@ clipper_set_affinity(unsigned int irq, const struct cpumask *affinity) | |||
| 199 | } | 199 | } |
| 200 | 200 | ||
| 201 | static struct irq_chip dp264_irq_type = { | 201 | static struct irq_chip dp264_irq_type = { |
| 202 | .typename = "DP264", | 202 | .name = "DP264", |
| 203 | .startup = dp264_startup_irq, | 203 | .startup = dp264_startup_irq, |
| 204 | .shutdown = dp264_disable_irq, | 204 | .shutdown = dp264_disable_irq, |
| 205 | .enable = dp264_enable_irq, | 205 | .enable = dp264_enable_irq, |
| @@ -210,7 +210,7 @@ static struct irq_chip dp264_irq_type = { | |||
| 210 | }; | 210 | }; |
| 211 | 211 | ||
| 212 | static struct irq_chip clipper_irq_type = { | 212 | static struct irq_chip clipper_irq_type = { |
| 213 | .typename = "CLIPPER", | 213 | .name = "CLIPPER", |
| 214 | .startup = clipper_startup_irq, | 214 | .startup = clipper_startup_irq, |
| 215 | .shutdown = clipper_disable_irq, | 215 | .shutdown = clipper_disable_irq, |
| 216 | .enable = clipper_enable_irq, | 216 | .enable = clipper_enable_irq, |