summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-12-13 15:43:30 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-12-13 15:43:30 +0000
commit292bdfb0285b757882b4e933c413d834b4324d4b (patch)
tree47bf1ba048da03f6219a65f97bdc9a8557b3ea11
parenteaff4e56b26ec68a6a4677543d40555f776db028 (diff)
downloaddrakx-292bdfb0285b757882b4e933c413d834b4324d4b.tar
drakx-292bdfb0285b757882b4e933c413d834b4324d4b.tar.gz
drakx-292bdfb0285b757882b4e933c413d834b4324d4b.tar.bz2
drakx-292bdfb0285b757882b4e933c413d834b4324d4b.tar.xz
drakx-292bdfb0285b757882b4e933c413d834b4324d4b.zip
(pcmcia_controller_probe) reuse pcmcia_controller_probe(), thus fixing
installer not handling anymore PCMCIA controllers managed by driver other than yenta_socket... this is still not enough for stage1 though (since mdk-stage1/pcmcia_/probe.c::pcmcia_probe() isn't aware of all PCMCIA host controller drivers that're known to list_modules.pm)
-rw-r--r--perl-install/detect_devices.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index c0a07f0c3..8ba1cc775 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -708,7 +708,7 @@ sub pcmcia_controller_probe() {
sub real_pcmcia_probe() {
return if $::testing;
- c::pcmcia_probe() || (find { $_->{driver} eq 'yenta_socket' } pci_probe()) && 'yenta_socket';
+ c::pcmcia_probe() || (pcmcia_controller_probe())[0]->{driver};
}
sub pcmcia_probe() {