From 234684d7e2fcca452ee5c0bedd0e82c15a3dc788 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Wed, 7 Jun 2000 18:20:40 +0000
Subject: *** empty log message ***

---
 perl-install/modules.pm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'perl-install/modules.pm')

diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 6eb380929..c1bdb2cfc 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -127,13 +127,13 @@ arch() =~ /^sparc/ ? (
   "sim710" => "sim710",
   "sym53c416" => "sym53c416",
   "tmscsim" => "tmscsim",
+  "scsi_mod" => "scsi_mod",
 ),
   "aic7xxx" => "Adaptec 2740, 2840, 2940",
   "ncr53c8xx" => "NCR 53C8xx PCI",
 #  "pci2000" => "Perceptive Solutions PCI-2000", # TODO
   "qlogicisp" => "Qlogic ISP",
   "sym53c8xx" => "Symbios 53c8xx",
-  "scsi_mod" => "scsi_mod",
   "sd_mod" => "sd_mod",
   "ide-mod" => "ide-mod",
   "ide-probe" => "ide-probe",
@@ -388,7 +388,10 @@ sub load {
 
     if ($type) {
 	add_alias('usb-interface', $name) if $type =~ /SERIAL_USB/i;
-	add_alias('scsi_hostadapter', $name) if $type eq "scsi" || $type eq $type_aliases{scsi};
+	if ($type eq "scsi" || $type eq $type_aliases{scsi}) {
+	    add_alias('scsi_hostadapter', $name);
+	    load("sd_mod");
+	}
     }
     $conf{$name}{options} = join " ", @options if @options;
 }
@@ -541,8 +544,6 @@ sub load_thiskind($;&$) {
 
     my @devs = (@pcidevs, @sbusdevs, @pcmciadevs);
 
-    load("sd_mod") if arch() !~ /sparc/ && $type eq 'scsi' && @devs;
-
     my %devs; foreach (@devs) {
 	my ($text, $mod) = @$_;
 	pci_probing::main::check($mod) or next;
-- 
cgit v1.2.1