From 98ec09cfd8beb5d74417a013430e9fcd948384d1 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Tue, 24 Mar 2009 23:22:49 +0100
Subject: [PATCH] --- yaml --- r: 133386 b: refs/heads/master c:
 49727e3d20ba10921572e35bc99b2c2e1b8c1dba h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 67034d109e9b..e42c3c4ee79c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 973d9e743979d4d3f06d8071c22187b2bdc0ef24
+refs/heads/master: 49727e3d20ba10921572e35bc99b2c2e1b8c1dba
diff --git a/trunk/drivers/ide/ns87415.c b/trunk/drivers/ide/ns87415.c
index 56042a36d635..ea48a3ee8063 100644
--- a/trunk/drivers/ide/ns87415.c
+++ b/trunk/drivers/ide/ns87415.c
@@ -287,8 +287,6 @@ static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif)
 
 	if (!using_inta)
 		hwif->irq = pci_get_legacy_ide_irq(dev, hwif->channel);
-	else if (!hwif->irq && hwif->mate && hwif->mate->irq)
-		hwif->irq = hwif->mate->irq;	/* share IRQ with mate */
 
 	if (!hwif->dma_base)
 		return;