diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-12-03 07:49:39 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-12-03 07:49:39 -0500 |
| commit | 220d0b1dbf78c6417a658c96e571415552d3abac (patch) | |
| tree | 70cd3862540c38ea490e7a27c3c7acc35b680234 /arch/alpha/kernel/irq_i8259.c | |
| parent | 474b18ccc264c472abeec50f48469b6477202699 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'arch/alpha/kernel/irq_i8259.c')
| -rw-r--r-- | arch/alpha/kernel/irq_i8259.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/irq_i8259.c b/arch/alpha/kernel/irq_i8259.c index 50bfec9b588..83a9ac28089 100644 --- a/arch/alpha/kernel/irq_i8259.c +++ b/arch/alpha/kernel/irq_i8259.c | |||
| @@ -84,7 +84,7 @@ i8259a_end_irq(unsigned int irq) | |||
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | struct irq_chip i8259a_irq_type = { | 86 | struct irq_chip i8259a_irq_type = { |
| 87 | .typename = "XT-PIC", | 87 | .name = "XT-PIC", |
| 88 | .startup = i8259a_startup_irq, | 88 | .startup = i8259a_startup_irq, |
| 89 | .shutdown = i8259a_disable_irq, | 89 | .shutdown = i8259a_disable_irq, |
| 90 | .enable = i8259a_enable_irq, | 90 | .enable = i8259a_enable_irq, |