summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-09-24 14:40:49 +0000
committerOlivier Blin <oblin@mandriva.com>2007-09-24 14:40:49 +0000
commit8c6fdf5b34ed44b04bf173c2b0c95c0cd305e0e4 (patch)
treea4c12f76e1352eaf061532ac411196bbfc5ab31c
parentf11b13bcfdfcd4c4faf18fd8b8b22347e10188ae (diff)
downloaddrakx-8c6fdf5b34ed44b04bf173c2b0c95c0cd305e0e4.tar
drakx-8c6fdf5b34ed44b04bf173c2b0c95c0cd305e0e4.tar.gz
drakx-8c6fdf5b34ed44b04bf173c2b0c95c0cd305e0e4.tar.bz2
drakx-8c6fdf5b34ed44b04bf173c2b0c95c0cd305e0e4.tar.xz
drakx-8c6fdf5b34ed44b04bf173c2b0c95c0cd305e0e4.zip
do not explicitely try to load ide-generic, ldetect will fallback to ide-generic when appropriate (#33043)
-rw-r--r--mdk-stage1/cdrom.c6
-rw-r--r--mdk-stage1/disk.c6
2 files changed, 0 insertions, 12 deletions
diff --git a/mdk-stage1/cdrom.c b/mdk-stage1/cdrom.c
index 89e5ef8dd..deb635ca5 100644
--- a/mdk-stage1/cdrom.c
+++ b/mdk-stage1/cdrom.c
@@ -136,7 +136,6 @@ enum return_type cdrom_prepare(void)
char * choice;
int i, count = 0;
enum return_type results;
- static int already_probed_ide_generic = 0;
my_insmod("ide_cd", ANY_DRIVER_TYPE, NULL, 0);
@@ -171,11 +170,6 @@ 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);
- return cdrom_prepare();
- }
stg1_error_message("No CDROM device found.");
i = ask_insmod(SCSI_ADAPTERS);
if (i == RETURN_BACK)
diff --git a/mdk-stage1/disk.c b/mdk-stage1/disk.c
index 7bebbdcc1..d87247562 100644
--- a/mdk-stage1/disk.c
+++ b/mdk-stage1/disk.c
@@ -118,16 +118,10 @@ enum return_type disk_prepare(void)
char * choice;
int i;
enum return_type results;
- static int already_probed_ide_generic = 0;
int count = get_disks(&medias, &medias_models);
if (count == 0) {
- if (!already_probed_ide_generic) {
- already_probed_ide_generic = 1;
- my_insmod("ide_generic", ANY_DRIVER_TYPE, NULL, 0);
- return disk_prepare();
- }
stg1_error_message("No DISK drive found.");
i = ask_insmod(SCSI_ADAPTERS);
if (i == RETURN_BACK)