diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/alpha/kernel/sys_dp264.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
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 46e70ece517..d64e1e497e7 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, |