summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-05-23 12:34:42 +0000
committerFrancois Pons <fpons@mandriva.com>2000-05-23 12:34:42 +0000
commitf5b64c37005cb2aa89563efe7f4d965c0a1d7440 (patch)
tree05fb333e0cc6035983a3a8b72b637d1459ca55e3
parentbda5afa37f77b4a69a7848bfa2a558f6027e5611 (diff)
downloaddrakx-backup-do-not-use-f5b64c37005cb2aa89563efe7f4d965c0a1d7440.tar
drakx-backup-do-not-use-f5b64c37005cb2aa89563efe7f4d965c0a1d7440.tar.gz
drakx-backup-do-not-use-f5b64c37005cb2aa89563efe7f4d965c0a1d7440.tar.bz2
drakx-backup-do-not-use-f5b64c37005cb2aa89563efe7f4d965c0a1d7440.tar.xz
drakx-backup-do-not-use-f5b64c37005cb2aa89563efe7f4d965c0a1d7440.zip
*** empty log message ***
-rw-r--r--perl-install/detect_devices.pm2
-rw-r--r--perl-install/modules.pm8
2 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index bed7d98ee..26a476c17 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -254,7 +254,7 @@ sub probeUSB {
require pci_probing::main;
require modules;
defined($usb_interface) and return $usb_interface;
- if (($usb_interface) = grep { /usb-/ } map { $_->[1] } pci_probing::main::probe('')) {
+ if (arch() !~ /sparc|alpha/ && ($usb_interface) = grep { /usb-/ } map { $_->[1] } pci_probing::main::probe('')) {
eval { modules::load($usb_interface, "SERIAL_USB") };
if ($@) {
$usb_interface = '';
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index d4e2bcddd..881d4f512 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -553,9 +553,11 @@ sub load_thiskind($;&$) {
-d "/proc/scsi/usb" or unload("usb-storage");
}
#- probe for parport SCSI.
- foreach ("imm", "ppa") {
- eval { load($_, $type) };
- last if !$@;
+ if (arch() !~ /sparc|alpha/) {
+ foreach ("imm", "ppa") {
+ eval { load($_, $type) };
+ last if !$@;
+ }
}
if (my ($c) = pci_probing::main::probe('AUDIO')) {
add_alias("sound", $c->[1]) if pci_probing::main::check($c->[1]);