From 13595f23d5c8b50aa36e398c82ff6d3ecdd12887 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: 133387 b: refs/heads/master c:
 1b166ae7bb9610cdd3c4c66b960aa04004054e41 h: refs/heads/master i:   133385:
 18d8a935d6e8b8b7a344b832d840573bf03b416c   133383:
 1f9aa46fc5bb521ecb62ca0b113702ebbd3e7ec7 v: v3

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

diff --git a/[refs] b/[refs]
index e42c3c4ee79c..e6dc9d3ceeb1 100644
--- 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
index b6a1285a4021..1c09e549c423 100644
--- 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
 	{