diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2009-04-07 10:30:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:44:06 -0400 |
commit | 51dcdfec6a274afc1c6fce180d582add9ff512c0 (patch) | |
tree | 51442c7adc06f36977859e8133b645c6c42ea0c9 /drivers/parport/parport_cs.c | |
parent | 8e7d91c97570ba1a16c0b4f984c04f04f039a231 (diff) |
parport: Use the PCI IRQ if offered
PCI parallel port devices can IRQ share so we should stop them hogging
the line and making a mess on modern PC systems. We know the sharing
side works as the PCMCIA driver has shared the parallel port IRQ for
some time.
Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/parport/parport_cs.c')
-rw-r--r-- | drivers/parport/parport_cs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c index 0cd5fbc7f2c2..8fdfa4f537a6 100644 --- a/drivers/parport/parport_cs.c +++ b/drivers/parport/parport_cs.c | |||
@@ -43,6 +43,7 @@ | |||
43 | #include <linux/timer.h> | 43 | #include <linux/timer.h> |
44 | #include <linux/ioport.h> | 44 | #include <linux/ioport.h> |
45 | #include <linux/major.h> | 45 | #include <linux/major.h> |
46 | #include <linux/interrupt.h> | ||
46 | 47 | ||
47 | #include <linux/parport.h> | 48 | #include <linux/parport.h> |
48 | #include <linux/parport_pc.h> | 49 | #include <linux/parport_pc.h> |
@@ -192,7 +193,7 @@ static int parport_config(struct pcmcia_device *link) | |||
192 | 193 | ||
193 | p = parport_pc_probe_port(link->io.BasePort1, link->io.BasePort2, | 194 | p = parport_pc_probe_port(link->io.BasePort1, link->io.BasePort2, |
194 | link->irq.AssignedIRQ, PARPORT_DMA_NONE, | 195 | link->irq.AssignedIRQ, PARPORT_DMA_NONE, |
195 | &link->dev); | 196 | &link->dev, IRQF_SHARED); |
196 | if (p == NULL) { | 197 | if (p == NULL) { |
197 | printk(KERN_NOTICE "parport_cs: parport_pc_probe_port() at " | 198 | printk(KERN_NOTICE "parport_cs: parport_pc_probe_port() at " |
198 | "0x%3x, irq %u failed\n", link->io.BasePort1, | 199 | "0x%3x, irq %u failed\n", link->io.BasePort1, |