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_alcor.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_alcor.c')
| -rw-r--r-- | arch/alpha/kernel/sys_alcor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/sys_alcor.c b/arch/alpha/kernel/sys_alcor.c index 382035ef739..20a30b8b965 100644 --- a/arch/alpha/kernel/sys_alcor.c +++ b/arch/alpha/kernel/sys_alcor.c | |||
| @@ -90,7 +90,7 @@ alcor_end_irq(unsigned int irq) | |||
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | static struct irq_chip alcor_irq_type = { | 92 | static struct irq_chip alcor_irq_type = { |
| 93 | .typename = "ALCOR", | 93 | .name = "ALCOR", |
| 94 | .startup = alcor_startup_irq, | 94 | .startup = alcor_startup_irq, |
| 95 | .shutdown = alcor_disable_irq, | 95 | .shutdown = alcor_disable_irq, |
| 96 | .enable = alcor_enable_irq, | 96 | .enable = alcor_enable_irq, |