summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2001-09-10 18:09:14 +0000
committerdamien <damien@mandriva.com>2001-09-10 18:09:14 +0000
commit16c55c4bf91d1953482c9bcb9c185e536c24325b (patch)
tree3b3a4fec0c77d81b41e2e1add22d3c1d8bdea882
parent5a27430fb7929b19c130dd53ec516c3a9d00082d (diff)
downloaddrakx-16c55c4bf91d1953482c9bcb9c185e536c24325b.tar
drakx-16c55c4bf91d1953482c9bcb9c185e536c24325b.tar.gz
drakx-16c55c4bf91d1953482c9bcb9c185e536c24325b.tar.bz2
drakx-16c55c4bf91d1953482c9bcb9c185e536c24325b.tar.xz
drakx-16c55c4bf91d1953482c9bcb9c185e536c24325b.zip
detect_devices
-rw-r--r--perl-install/network/ethernet.pm2
-rw-r--r--perl-install/network/modem.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 3eba45359..fe2d0dd96 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -141,7 +141,7 @@ sub conf_network_card_backend {
my @all_cards = detect_devices::getNet();
$netc->{nb_cards} = @all_cards;
- my @devs = modules::get_pcmcia_devices();
+ my @devs = detect_devices::pcmcia_probe();
modules::mergein_conf("$prefix/etc/modules.conf");
my $saved_driver;
return map {
diff --git a/perl-install/network/modem.pm b/perl-install/network/modem.pm
index 594e2f9ff..274a39530 100644
--- a/perl-install/network/modem.pm
+++ b/perl-install/network/modem.pm
@@ -79,7 +79,7 @@ sub modem_detect_backend {
#- add an alias for macserial on PPC
modules::add_alias('serial', $serdev) if (arch() =~ /ppc/ && $modem->{device});
- my @devs = modules::get_pcmcia_devices();
+ my @devs = detect_devices::pcmcia_probe();
foreach (@devs) {
$_->{type} =~ /serial/ and $modem->{device} = $_->{device};
}