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_eb64p.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_eb64p.c')
| -rw-r--r-- | arch/alpha/kernel/sys_eb64p.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/sys_eb64p.c b/arch/alpha/kernel/sys_eb64p.c index 660c23ef661..df2090ce5e7 100644 --- a/arch/alpha/kernel/sys_eb64p.c +++ b/arch/alpha/kernel/sys_eb64p.c | |||
| @@ -70,7 +70,7 @@ eb64p_end_irq(unsigned int irq) | |||
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | static struct irq_chip eb64p_irq_type = { | 72 | static struct irq_chip eb64p_irq_type = { |
| 73 | .typename = "EB64P", | 73 | .name = "EB64P", |
| 74 | .startup = eb64p_startup_irq, | 74 | .startup = eb64p_startup_irq, |
| 75 | .shutdown = eb64p_disable_irq, | 75 | .shutdown = eb64p_disable_irq, |
| 76 | .enable = eb64p_enable_irq, | 76 | .enable = eb64p_enable_irq, |