diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /arch/ppc/syslib/i8259.c | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/ppc/syslib/i8259.c')
| -rw-r--r-- | arch/ppc/syslib/i8259.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/ppc/syslib/i8259.c b/arch/ppc/syslib/i8259.c index b9391e650141..5c7908c20e43 100644 --- a/arch/ppc/syslib/i8259.c +++ b/arch/ppc/syslib/i8259.c | |||
| @@ -129,14 +129,11 @@ static void i8259_end_irq(unsigned int irq) | |||
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | struct hw_interrupt_type i8259_pic = { | 131 | struct hw_interrupt_type i8259_pic = { |
| 132 | " i8259 ", | 132 | .typename = " i8259 ", |
| 133 | NULL, | 133 | .enable = i8259_unmask_irq, |
| 134 | NULL, | 134 | .disable = i8259_mask_irq, |
| 135 | i8259_unmask_irq, | 135 | .ack = i8259_mask_and_ack_irq, |
| 136 | i8259_mask_irq, | 136 | .end = i8259_end_irq, |
| 137 | i8259_mask_and_ack_irq, | ||
| 138 | i8259_end_irq, | ||
| 139 | NULL | ||
| 140 | }; | 137 | }; |
| 141 | 138 | ||
| 142 | static struct resource pic1_iores = { | 139 | static struct resource pic1_iores = { |