---

yaml --- r: 133387 b: refs/heads/master c: 1b166ae h: refs/heads/master i: 133385: 18d8a93 133383: 1f9aa46 v: v3
git-mirror · Mar 24, 2009 · 13595f2 · 13595f2
1 parent 98ec09c
commit 13595f2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49727e3d20ba10921572e35bc99b2c2e1b8c1dba
+refs/heads/master: 1b166ae7bb9610cdd3c4c66b960aa04004054e41
diff --git a/trunk/drivers/ide/trm290.c b/trunk/drivers/ide/trm290.c
@@ -277,9 +277,6 @@ static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
 	if (reg & 0x10)
 		/* legacy mode */
 		hwif->irq = hwif->channel ? 15 : 14;
-	else if (!hwif->irq && hwif->mate && hwif->mate->irq)
-		/* sharing IRQ with mate */
-		hwif->irq = hwif->mate->irq;
 
 #if 1
 	{