summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2004-02-11 15:54:17 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2004-02-11 15:54:17 +0000
commitc68103814adeb73b3a1069f1a6111f0974f132b2 (patch)
treef44d224c71d54ad075b26e1dac5791898cd7f1da
parentef279b6ea80743b2879012847aeaa55ee7b5eb06 (diff)
downloaddrakx-c68103814adeb73b3a1069f1a6111f0974f132b2.tar
drakx-c68103814adeb73b3a1069f1a6111f0974f132b2.tar.gz
drakx-c68103814adeb73b3a1069f1a6111f0974f132b2.tar.bz2
drakx-c68103814adeb73b3a1069f1a6111f0974f132b2.tar.xz
drakx-c68103814adeb73b3a1069f1a6111f0974f132b2.zip
be sure to load usb-storage after SCSI adapters, so that they are in
same order than reboot, so that naming is the same
-rw-r--r--mdk-stage1/probing.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c
index 433f48481..1dbdb2ebd 100644
--- a/mdk-stage1/probing.c
+++ b/mdk-stage1/probing.c
@@ -165,14 +165,6 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u
static int already_probed_usb_controllers = 0;
static int already_loaded_usb_scsi = 0;
- if (type == SCSI_ADAPTERS && already_probed_usb_controllers && !already_loaded_usb_scsi) {
- already_loaded_usb_scsi = 1;
- /* we can't allow additional modules floppy since we need usbkbd for keystrokes of usb keyboards */
- my_insmod("usb-storage", SCSI_ADAPTERS, NULL, 0);
- if (module_already_present("ieee1394"))
- my_insmod("sbp2", SCSI_ADAPTERS, NULL, 0);
- }
-
/* ---- PCI probe ---------------------------------------------- */
{
FILE * f = NULL;
@@ -354,6 +346,16 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u
fclose(f);
}
#endif
+
+ /* be sure to load usb-storage after SCSI adapters, so that they are in
+ same order than reboot, so that naming is the same */
+ if (type == SCSI_ADAPTERS && already_probed_usb_controllers && !already_loaded_usb_scsi) {
+ already_loaded_usb_scsi = 1;
+ /* we can't allow additional modules floppy since we need usbkbd for keystrokes of usb keyboards */
+ my_insmod("usb-storage", SCSI_ADAPTERS, NULL, 0);
+ if (module_already_present("ieee1394"))
+ my_insmod("sbp2", SCSI_ADAPTERS, NULL, 0);
+ }
}