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 {