From eaff4e56b26ec68a6a4677543d40555f776db028 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 13 Dec 2004 15:43:14 +0000
Subject: (pcmcia_controller_probe) move some harddrake code there

---
 perl-install/detect_devices.pm | 6 ++++++
 perl-install/harddrake/data.pm | 6 +-----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index d293ba47a..c0a07f0c3 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -699,6 +699,12 @@ sub firewire_probe() {
     @l;
 }
 
+sub pcmcia_controller_probe() {
+    require list_modules;
+    my @modules = list_modules::category2modules('bus/pcmcia');
+    grep { member($_->{driver}, @modules) } probeall();
+}
+
 sub real_pcmcia_probe() {
     return if $::testing;
 
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index d45486270..a17b77535 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -317,11 +317,7 @@ our @tree =
       string => N("PCMCIA controllers"),
       icon => "scsi.png",
       configurator => "",
-      detector => sub {
-          require list_modules;
-          my @modules = list_modules::category2modules('bus/pcmcia');
-          f(grep { member($_->{driver}, @modules) } @devices);
-      },
+      detector => sub { f(detect_devices::pcmcia_controller_probe()) },
       checked_on_boot => 1,
      },
 
-- 
cgit v1.2.1