diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-01 02:55:20 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-01 02:55:20 -0500 |
| commit | 35858adbfca13678af99fb31618ef4428d6dedb0 (patch) | |
| tree | 3336feaa61324486945816cb52c347733e7c0821 /drivers/parisc/iosapic.c | |
| parent | 197d4db752e67160d79fed09968c2140376a80a3 (diff) | |
| parent | 4b70858ba8d4537daf782defebe5f2ff80ccef2b (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/parisc/iosapic.c')
| -rw-r--r-- | drivers/parisc/iosapic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c index 88e333553212..c76836727cae 100644 --- a/drivers/parisc/iosapic.c +++ b/drivers/parisc/iosapic.c | |||
| @@ -730,7 +730,7 @@ static int iosapic_set_affinity_irq(unsigned int irq, | |||
| 730 | #endif | 730 | #endif |
| 731 | 731 | ||
| 732 | static struct irq_chip iosapic_interrupt_type = { | 732 | static struct irq_chip iosapic_interrupt_type = { |
| 733 | .typename = "IO-SAPIC-level", | 733 | .name = "IO-SAPIC-level", |
| 734 | .startup = iosapic_startup_irq, | 734 | .startup = iosapic_startup_irq, |
| 735 | .shutdown = iosapic_disable_irq, | 735 | .shutdown = iosapic_disable_irq, |
| 736 | .enable = iosapic_enable_irq, | 736 | .enable = iosapic_enable_irq, |