From 006b8d345eb75ef64a81ca0c3961415ab14a286a Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 10 Oct 2008 22:39:24 +0200 Subject: [PATCH] --- yaml --- r: 112876 b: refs/heads/master c: a2cdee5a9a93360165d0576bbc7e9ccb3127afee h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-probe.c | 3 ++- trunk/include/linux/ide.h | 4 ---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index c56448fbae08..d0385f73c074 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c199a5496d0579d388636ee34a954e2e566d2fb +refs/heads/master: a2cdee5a9a93360165d0576bbc7e9ccb3127afee diff --git a/trunk/drivers/ide/ide-probe.c b/trunk/drivers/ide/ide-probe.c index a27c0398b153..8cfce50c71e4 100644 --- a/trunk/drivers/ide/ide-probe.c +++ b/trunk/drivers/ide/ide-probe.c @@ -1105,7 +1105,8 @@ static int init_irq (ide_hwif_t *hwif) sa = IRQF_SHARED; #endif /* __mc68000__ */ - if (IDE_CHIPSET_IS_PCI(hwif->chipset)) + if (hwif->chipset == ide_pci || hwif->chipset == ide_cmd646 || + hwif->chipset == ide_ali14xx) sa = IRQF_SHARED; if (io_ports->ctl_addr) diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h index 2ad8548135d2..a9206c463d7d 100644 --- a/trunk/include/linux/ide.h +++ b/trunk/include/linux/ide.h @@ -473,10 +473,6 @@ typedef struct ide_drive_s ide_drive_t; #define to_ide_device(dev)container_of(dev, ide_drive_t, gendev) -#define IDE_CHIPSET_PCI_MASK \ - ((1<> (c)) & 1) - struct ide_task_s; struct ide_port_info;