From 143e9be502db18108d7c41bbb5d43ad0d89aa546 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Fri, 6 Oct 2000 09:36:15 +0000
Subject: *** empty log message ***

---
 perl-install/ChangeLog   | 7 +++++++
 perl-install/install2.pm | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index f76303b99..df52bf234 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-05  François Pons  <fpons@mandrakesoft.com>
+
+	* install2.pm: fixed bad call to hasUsb...
+
+	* share/Cards+: fixed wrong use of SiS card with 4.0.1, only keep
+	530, 620 and 6326 with XFree 4.0.1.
+
 2000-10-06  DrakX <install@linux-mandrake.com>
 
 	* snapshot uploaded
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 958f9b105..bab27e803 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -349,9 +349,9 @@ sub miscellaneous {
 	my $f = "$o->{prefix}/etc/sysconfig/usb";
 	output $f,
 "USB=yes
-MOUSE=" . bool2yesno(hasUsbMouse()) . "
-KEYBOARD=" . bool2yesno(hasUsbKeyboard()) . "
-STORAGE=" . bool2yesno(hasUsbZip()) . "
+MOUSE=" . bool2yesno(detect_devices::hasUsbMouse()) . "
+KEYBOARD=" . bool2yesno(detect_devices::hasUsbKeyboard()) . "
+STORAGE=" . bool2yesno(detect_devices::hasUsbZip()) . "
 VISOR=no
 " if modules::get_alias("usb-interface") && ! -e $f;
 
-- 
cgit v1.2.1