diff options
Diffstat (limited to 'perl-install/detect_devices.pm')
| -rw-r--r-- | perl-install/detect_devices.pm | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 7eaf18ab6..9908497cf 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -474,15 +474,6 @@ sub getMmcBlk() { glob("/sys/bus/mmc/devices/*/block/*"); } -# cpu_name : arch() =~ /^alpha/ ? "cpu " : -# arch() =~ /^ppc/ ? "processor" : "vendor_id" - -# cpu_model : arch() =~ /^alpha/ ? "cpu model" : -# arch() =~ /^ppc/ ? "cpu " : "model name" - -# cpu_freq = arch() =~ /^alpha/ ? "cycle frequency [Hz]" : -# arch() =~ /^ppc/ ? "clock" : "cpu MHz" - =item getCPUs() Returns a list of all CPUs. @@ -521,9 +512,6 @@ sub probe_category { require list_modules; my @modules = list_modules::category2modules($category); - if_($category =~ /sound/ && arch() =~ /ppc/ && get_mac_model() !~ /IBM/, - { driver => 'snd_powermac', description => 'Macintosh built-in' }, - ), grep { if ($category eq 'network/isdn') { my $b = $_->{driver} =~ /ISDN:([^,]*),?([^,]*)(?:,firmware=(.*))?/; @@ -692,7 +680,7 @@ sub getSerialModem { my ($modules_conf, $o_mouse) = @_; my $mouse = $o_mouse || {}; $mouse->{device} = readlink "/dev/mouse"; - my $serdev = arch() =~ /ppc/ ? "macserial" : arch() =~ /mips/ ? "8250" : "serial"; + my $serdev = arch() =~ /mips/ ? "8250" : "serial"; eval { modules::load($serdev) }; @@ -708,8 +696,6 @@ sub getSerialModem { } my @devs = pcmcia_probe(); foreach my $modem (@modems) { - #- add an alias for macserial on PPC - $modules_conf->set_alias('serial', $serdev) if arch() =~ /ppc/ && $modem->{device}; foreach (@devs) { $_->{device} and $modem->{device} = $_->{device} } } @modems; @@ -1402,8 +1388,6 @@ Intel ipw2100/2200/3945 Wireless =cut sub isLaptop() { - arch() =~ /ppc/ ? - get_mac_model() =~ /Book/ : computer_info()->{isLaptop} || glob_("/sys/bus/acpi/devices/PNP0C0D:*") #- ACPI lid button || (matching_desc__regexp('C&T.*655[45]\d') || matching_desc__regexp('C&T.*68554') || @@ -1446,7 +1430,7 @@ sub isHyperv() { } sub BIGMEM() { - arch() !~ /x86_64|ia64/ && $> == 0 && dmi_detect_memory() > 4 * 1024; + arch() !~ /x86_64/ && $> == 0 && dmi_detect_memory() > 4 * 1024; } sub is_i586() { |