From 6b69393d2b0c2911f486ca6c0046ccf6e1a3f238 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 18 Aug 2000 05:44:25 +0000
Subject: no_comment

---
 perl-install/modules.pm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

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

diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index facef09c9..5f6de00f8 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -272,12 +272,13 @@ arch() !~ /^sparc/ ? (
   "serial" => "serial",
   "qpmouse" => "qpmouse",
   "atixlmouse" => "atixlmouse",
-
-  "usb-uhci", "USB (uhci)",
-  "usb-ohci", "USB (ohci)",
-  "usb-ohci-hcd", "USB (ohci-hcd)",
 ) : (),
 }],
+[ 'usb', {
+  "usb-uhci" => "USB (uhci)",
+  "usb-ohci" => "USB (ohci)",
+  "usb-ohci-hcd" => "USB (ohci-hcd)",
+}],
 [ 'fs', {
   "smbfs" => "Windows SMB",
   "fat" => "fat",
@@ -381,7 +382,6 @@ sub load {
 	-d "/proc/scsi/usb" or return;
     }
     if ($type) {
-	add_alias('usb-interface', $name) if $type =~ /SERIAL_USB/i;
 	add_alias('scsi_hostadapter', $name), load('sd_mod') if $type =~ /scsi/ || $type eq $type_aliases{scsi};
     }
     $conf{$name}{options} = join " ", @options if @options;
@@ -532,7 +532,8 @@ sub load_thiskind {
 	!($@ && $_->{try});
     } get_that_type($type, $pcic),
       $type =~ /scsi/ && arch() !~ /sparc/ ? 
-	(map { +{ driver => $_, description => $_, try => 1 } } "usb-storage", "imm", "ppa") : ();
+	(map { +{ driver => $_, description => $_, try => 1 } } 
+	 get_alias("usb-interface") ? "usb-storage" : (), "imm", "ppa") : ();
 }
 
 sub get_that_type {
-- 
cgit v1.2.1