diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-10 01:40:31 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-10 01:40:31 -0500 |
| commit | b5c00a3a412857d6f07970984068c450429e051c (patch) | |
| tree | 1fde50630cbc24e11a45169f717f281db8eb6dcc /arch/alpha/kernel/irq_pyxis.c | |
| parent | ca6f2d7fafd2d48b2f6943f5c6787beaec2014d0 (diff) | |
| parent | 3067e02f8f3ae2f3f02ba76400d03b8bcb4942b0 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/for-2.6.33
Diffstat (limited to 'arch/alpha/kernel/irq_pyxis.c')
| -rw-r--r-- | arch/alpha/kernel/irq_pyxis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/irq_pyxis.c b/arch/alpha/kernel/irq_pyxis.c index 69199a76ec4a..989ce46a0cf3 100644 --- a/arch/alpha/kernel/irq_pyxis.c +++ b/arch/alpha/kernel/irq_pyxis.c | |||
| @@ -71,7 +71,7 @@ pyxis_mask_and_ack_irq(unsigned int irq) | |||
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | static struct irq_chip pyxis_irq_type = { | 73 | static struct irq_chip pyxis_irq_type = { |
| 74 | .typename = "PYXIS", | 74 | .name = "PYXIS", |
| 75 | .startup = pyxis_startup_irq, | 75 | .startup = pyxis_startup_irq, |
| 76 | .shutdown = pyxis_disable_irq, | 76 | .shutdown = pyxis_disable_irq, |
| 77 | .enable = pyxis_enable_irq, | 77 | .enable = pyxis_enable_irq, |