From dcb572959c8911d792ddabd8854a216f8097fc07 Mon Sep 17 00:00:00 2001
From: Fr?d?ric Bri?re <fbriere@fbriere.net>
Date: Tue, 10 Aug 2010 18:03:30 -0700
Subject: [PATCH] --- yaml --- r: 208557 b: refs/heads/master c:
 832ccf6f44969b616b2aeea25276684cf104fa3b h: refs/heads/master i:   208555:
 c7d7599117b304a813be7bf89ae6f43f5716aa19 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/parport/parport_serial.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b734d1ca6ba4..21505c0cdeb9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 863a6049202412a6d655d052eb1c45ca7dd74a83
+refs/heads/master: 832ccf6f44969b616b2aeea25276684cf104fa3b
diff --git a/trunk/drivers/parport/parport_serial.c b/trunk/drivers/parport/parport_serial.c
index 40e208d130f5..f01e26440f11 100644
--- a/trunk/drivers/parport/parport_serial.c
+++ b/trunk/drivers/parport/parport_serial.c
@@ -342,7 +342,6 @@ static int __devinit parport_register (struct pci_dev *dev,
 			dev_dbg(&dev->dev,
 		"PCI parallel port detected: I/O at %#lx(%#lx), IRQ %d\n",
 				io_lo, io_hi, irq);
-			irq = PARPORT_IRQ_NONE;
 		}
 		port = parport_pc_probe_port (io_lo, io_hi, irq,
 			      PARPORT_DMA_NONE, &dev->dev, IRQF_SHARED);