diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-12-07 07:14:12 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-07 07:14:18 -0500 |
| commit | f3d607c6b39bd9cb5000e03e2c0dc2afe1241374 (patch) | |
| tree | 885b5e0b5bb3d87efc4bfbde69feff2ece32ecac /arch/alpha/kernel/sys_takara.c | |
| parent | 8055039c2a2454c7159dcbde3161943b757a6e0e (diff) | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: we want to queue up a dependent fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 830318c21661..230464885b5c 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, |