patch-2.4.9 linux/drivers/ide/ide-probe.c

• Lines: 12
• Date: Mon Aug 13 15:00:37 2001
• Orig file: v2.4.8/linux/drivers/ide/ide-probe.c
• Orig date: Sun Mar 18 09:25:02 2001

diff -u --recursive --new-file v2.4.8/linux/drivers/ide/ide-probe.c linux/drivers/ide/ide-probe.c
@@ -681,9 +681,9 @@
 	 */
 	if (!match || match->irq != hwif->irq) {
 #ifdef CONFIG_IDEPCI_SHARE_IRQ
-		int sa = (hwif->chipset == ide_pci) ? SA_SHIRQ : SA_INTERRUPT;
+		int sa = IDE_CHIPSET_IS_PCI(hwif->chipset) ? SA_SHIRQ : SA_INTERRUPT;
 #else /* !CONFIG_IDEPCI_SHARE_IRQ */
-		int sa = (hwif->chipset == ide_pci) ? SA_INTERRUPT|SA_SHIRQ : SA_INTERRUPT;
+		int sa = IDE_CHIPSET_IS_PCI(hwif->chipset) ? SA_INTERRUPT|SA_SHIRQ : SA_INTERRUPT;
 #endif /* CONFIG_IDEPCI_SHARE_IRQ */
 		if (ide_request_irq(hwif->irq, &ide_intr, sa, hwif->name, hwgroup)) {
 			if (!match)