From 07360c5bfa15ab267f71c282053e9e511310e0e2 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Tue, 18 Mar 2008 16:58:40 +0000 Subject: load disk/ide before disk/scsi (to prevent sata deps from overriding non-libata pata modules, like in install::steps) --- mdk-stage1/probing.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'mdk-stage1/probing.c') diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c index 729ad0b16..8da6fada8 100644 --- a/mdk-stage1/probing.c +++ b/mdk-stage1/probing.c @@ -202,7 +202,9 @@ void probing_detect_devices() struct pciusb_entry *e = &entries.entries[i]; #ifndef DISABLE_PCIADAPTERS #ifndef DISABLE_MEDIAS - if (add_detected_device_if_match(e, medias_pci_modules, medias_pci_modules_len)) + if (add_detected_device_if_match(e, medias_ide_pci_modules, medias_ide_pci_modules_len)) + continue; + if (add_detected_device_if_match(e, medias_other_pci_modules, medias_other_pci_modules_len)) continue; #endif @@ -328,7 +330,8 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u if (already_probed_media_adapters) break; already_probed_media_adapters = 1; - probe_pci_modules(type, medias_pci_modules, medias_pci_modules_len); + probe_pci_modules(type, medias_ide_pci_modules, medias_ide_pci_modules_len); + probe_pci_modules(type, medias_other_pci_modules, medias_other_pci_modules_len); break; #endif #ifndef DISABLE_NETWORK -- cgit v1.2.1