From 160adb57069d9b7d773f7f0c6679d793cb29ad8d Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Mon, 29 Dec 2008 20:27:32 +0100 Subject: [PATCH] --- yaml --- r: 123515 b: refs/heads/master c: 02fb5683c98b0ce9ff75d890ebccd8e520d0e7a9 h: refs/heads/master i: 123513: d1dfff0cf285e295117d14440f880ab99a6a222e 123511: 2d07b6be76d0260ee2d4b55e23b46f86f19eff60 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-probe.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 398a312b6102..8b9abe3dbaad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27c01c2db05c3cf8824975e50403cd4fd9356dca +refs/heads/master: 02fb5683c98b0ce9ff75d890ebccd8e520d0e7a9 diff --git a/trunk/drivers/ide/ide-probe.c b/trunk/drivers/ide/ide-probe.c index 504bc9480e93..b0f9ededfad7 100644 --- a/trunk/drivers/ide/ide-probe.c +++ b/trunk/drivers/ide/ide-probe.c @@ -1125,8 +1125,7 @@ static int init_irq (ide_hwif_t *hwif) sa = IRQF_SHARED; #endif /* __mc68000__ */ - if (hwif->chipset == ide_pci || hwif->chipset == ide_cmd646 || - hwif->chipset == ide_ali14xx) + if (hwif->chipset == ide_pci || hwif->chipset == ide_cmd646) sa = IRQF_SHARED; if (io_ports->ctl_addr)