summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-02-28 19:18:05 +0000
committerOlivier Blin <oblin@mandriva.com>2008-02-28 19:18:05 +0000
commitc2a5497cd45e7eb9d57aaadff35805ed2b63fd76 (patch)
tree1ed8bf627721db1f523ee402c19aa4e5e94aca84
parent939e6a8837b6c5926b44937d1489a5f07f91c28a (diff)
downloaddrakx-backup-do-not-use-c2a5497cd45e7eb9d57aaadff35805ed2b63fd76.tar
drakx-backup-do-not-use-c2a5497cd45e7eb9d57aaadff35805ed2b63fd76.tar.gz
drakx-backup-do-not-use-c2a5497cd45e7eb9d57aaadff35805ed2b63fd76.tar.bz2
drakx-backup-do-not-use-c2a5497cd45e7eb9d57aaadff35805ed2b63fd76.tar.xz
drakx-backup-do-not-use-c2a5497cd45e7eb9d57aaadff35805ed2b63fd76.zip
probe usb-storage/sbp2 only when probing USB/SCSI buses (to make automatic boot faster on IDE)
-rw-r--r--mdk-stage1/probing.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c
index 033fb44bc..035ddb106 100644
--- a/mdk-stage1/probing.c
+++ b/mdk-stage1/probing.c
@@ -486,7 +486,8 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u
/* be sure to load usb-storage after media adapters, so that they are in
same order than reboot, so that naming is the same */
- if (type == MEDIA_ADAPTERS && already_probed_usb_controllers && !already_loaded_usb_scsi) {
+ if (type == MEDIA_ADAPTERS && (bus == BUS_USB || bus == BUS_SCSI || bus == BUS_ANY) &&
+ 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", MEDIA_ADAPTERS, NULL, 0);