diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /drivers/macintosh/macio_asic.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'drivers/macintosh/macio_asic.c')
| -rw-r--r-- | drivers/macintosh/macio_asic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c index 7817cf286d0c..d56216067549 100644 --- a/drivers/macintosh/macio_asic.c +++ b/drivers/macintosh/macio_asic.c | |||
| @@ -332,7 +332,7 @@ static void macio_create_fixup_irq(struct macio_dev *dev, int index, | |||
| 332 | { | 332 | { |
| 333 | unsigned int irq; | 333 | unsigned int irq; |
| 334 | 334 | ||
| 335 | irq = irq_create_mapping(NULL, line, 0); | 335 | irq = irq_create_mapping(NULL, line); |
| 336 | if (irq != NO_IRQ) { | 336 | if (irq != NO_IRQ) { |
| 337 | dev->interrupt[index].start = irq; | 337 | dev->interrupt[index].start = irq; |
| 338 | dev->interrupt[index].flags = IORESOURCE_IRQ; | 338 | dev->interrupt[index].flags = IORESOURCE_IRQ; |