---

yaml --- r: 133386 b: refs/heads/master c: 49727e3 h: refs/heads/master v: v3
git-mirror · Mar 24, 2009 · 98ec09c · 98ec09c
1 parent 18d8a93
commit 98ec09c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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;