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_takara.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_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 830318c2166..230464885b5 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, |