From aac7032ff4116a154d224ecd5457d8a043f4106c Mon Sep 17 00:00:00 2001
From: Stew Benedict <stewb@mandriva.org>
Date: Tue, 20 Mar 2001 14:26:11 +0000
Subject: any.pm: enable module load PPC detect_devices.pm: forgot to remove
 commented code after test netconnect.pm: load macserial module for PPC

---
 perl-install/any.pm            | 1 -
 perl-install/detect_devices.pm | 8 --------
 2 files changed, 9 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/any.pm b/perl-install/any.pm
index 583cd69bf..2494bd8c0 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -590,7 +590,6 @@ sub miscellaneousNetwork {
 sub setup_thiskind {
     my ($in, $type, $auto, $at_least_one) = @_;
 
-    return if arch() eq "ppc";
     my @l = setup_thiskind_backend ($type, $auto, $at_least_one, sub { my $w = wait_load_module($in, $type, @_); } );
 
     if (!$::noauto) {
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index d3bdbf8b7..0ceb0b1e4 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -55,15 +55,7 @@ sub burners    { grep { $_->{type} eq 'cdrom' && isBurner($_->{device}) } get()
 sub IDEburners { grep { $_->{type} eq 'cdrom' && isBurner($_->{device}) } getIDE() }
 
 sub get_mac_model() {
-#	open(FILE, "/proc/device-tree/model") || die "Can't open /proc/device-tree/model";
-#	my $mac_model = "";
-#	local $_ = "";
-#	while (<FILE>){
-#		$mac_model = $_;
-#	}
-#	close(FILE);
 	my $mac_model = cat_("/proc/device-tree/model") || die "Can't open /proc/device-tree/model";
-#	chop($mac_model);
 	log::l("Mac model: $mac_model");
 	$mac_model;	
 }
-- 
cgit v1.2.1