---

yaml --- r: 123515 b: refs/heads/master c: 02fb568 h: refs/heads/master i: 123513: d1dfff0 123511: 2d07b6b v: v3
git-mirror · Dec 29, 2008 · 160adb5 · 160adb5
1 parent cecb03d
commit 160adb5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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)