diff options
| author | Olivier Blin <oblin@mandriva.com> | 2007-08-21 17:01:45 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2007-08-21 17:01:45 +0000 |
| commit | 2ebb4c8f00e785daa2e7480e996ecd5a2890f47a (patch) | |
| tree | d523bab081faf34dc0f7a0ccecf8fe0226cf45ae | |
| parent | 66c621beb24e42eb3d4e729a3a883c3269a8aef9 (diff) | |
| download | drakx-2ebb4c8f00e785daa2e7480e996ecd5a2890f47a.tar drakx-2ebb4c8f00e785daa2e7480e996ecd5a2890f47a.tar.gz drakx-2ebb4c8f00e785daa2e7480e996ecd5a2890f47a.tar.bz2 drakx-2ebb4c8f00e785daa2e7480e996ecd5a2890f47a.tar.xz drakx-2ebb4c8f00e785daa2e7480e996ecd5a2890f47a.zip | |
use '_' in module names when explicitely loading modules
| -rw-r--r-- | mdk-stage1/cdrom.c | 4 | ||||
| -rw-r--r-- | mdk-stage1/disk.c | 2 | ||||
| -rw-r--r-- | mdk-stage1/probing.c | 2 | ||||
| -rw-r--r-- | mdk-stage1/tools.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/mdk-stage1/cdrom.c b/mdk-stage1/cdrom.c index 3657fcf4f..65220c597 100644 --- a/mdk-stage1/cdrom.c +++ b/mdk-stage1/cdrom.c @@ -136,7 +136,7 @@ enum return_type cdrom_prepare(void) enum return_type results; static int already_probed_ide_generic = 0; - my_insmod("ide-cd", ANY_DRIVER_TYPE, NULL, 0); + my_insmod("ide_cd", ANY_DRIVER_TYPE, NULL, 0); if (IS_AUTOMATIC) { get_medias(CDROM, &medias, &medias_models, BUS_IDE); @@ -171,7 +171,7 @@ enum return_type cdrom_prepare(void) if (count == 0) { if (!already_probed_ide_generic) { already_probed_ide_generic = 1; - my_insmod("ide-generic", ANY_DRIVER_TYPE, NULL, 0); + my_insmod("ide_generic", ANY_DRIVER_TYPE, NULL, 0); return cdrom_prepare(); } stg1_error_message("No CDROM device found."); diff --git a/mdk-stage1/disk.c b/mdk-stage1/disk.c index 0fa789d91..7bebbdcc1 100644 --- a/mdk-stage1/disk.c +++ b/mdk-stage1/disk.c @@ -125,7 +125,7 @@ enum return_type disk_prepare(void) if (count == 0) { if (!already_probed_ide_generic) { already_probed_ide_generic = 1; - my_insmod("ide-generic", ANY_DRIVER_TYPE, NULL, 0); + my_insmod("ide_generic", ANY_DRIVER_TYPE, NULL, 0); return disk_prepare(); } stg1_error_message("No DISK drive found."); diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c index ae35d0c1e..adb6c4861 100644 --- a/mdk-stage1/probing.c +++ b/mdk-stage1/probing.c @@ -497,7 +497,7 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u 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); + my_insmod("usb_storage", SCSI_ADAPTERS, NULL, 0); if (module_already_present("ieee1394")) my_insmod("sbp2", SCSI_ADAPTERS, NULL, 0); wait_message("Detecting USB mass-storage devices."); diff --git a/mdk-stage1/tools.c b/mdk-stage1/tools.c index 4a3f0c067..2909d2e60 100644 --- a/mdk-stage1/tools.c +++ b/mdk-stage1/tools.c @@ -271,7 +271,7 @@ int get_disks(char *** names, char *** models) char ** ptr; int count = 0; - my_insmod("ide-disk", ANY_DRIVER_TYPE, NULL, 0); + my_insmod("ide_disk", ANY_DRIVER_TYPE, NULL, 0); my_insmod("sd_mod", ANY_DRIVER_TYPE, NULL, 0); get_medias(DISK, names, models, BUS_ANY); @@ -292,7 +292,7 @@ int get_cdroms(char *** names, char *** models) char ** ptr; int count = 0; - my_insmod("ide-cd", ANY_DRIVER_TYPE, NULL, 0); + my_insmod("ide_cd", ANY_DRIVER_TYPE, NULL, 0); my_insmod("sr_mod", ANY_DRIVER_TYPE, NULL, 0); get_medias(CDROM, names, models, BUS_ANY); |