summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2009-05-04 16:05:58 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2009-05-04 16:05:58 +0000
commit31e10542594e47573b9eaac143874d4bb0ed0ec9 (patch)
tree5bb551b82438330b0530ac8c719be836eac43fa0 /perl-install
parentbe36fdfacbafb90f2b9561c45b7dbb56cca9fd29 (diff)
downloaddrakx-31e10542594e47573b9eaac143874d4bb0ed0ec9.tar
drakx-31e10542594e47573b9eaac143874d4bb0ed0ec9.tar.gz
drakx-31e10542594e47573b9eaac143874d4bb0ed0ec9.tar.bz2
drakx-31e10542594e47573b9eaac143874d4bb0ed0ec9.tar.xz
drakx-31e10542594e47573b9eaac143874d4bb0ed0ec9.zip
Detect Elantech touchpad
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/detect_devices.pm1
-rw-r--r--perl-install/modules.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index ce6c8e029..dce726063 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -493,6 +493,7 @@ sub getInputDevices() {
$device->{Synaptics} = $descr eq 'SynPS/2 Synaptics TouchPad';
$device->{ALPS} = $descr =~ m!^AlpsPS/2 ALPS!;
+ $device->{Elantech} = $descr eq 'ETPS/2 Elantech Touchpad';
} elsif (/H: Handlers=(.*)/) {
my @l = split(' ', $1);
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index af6a10aa3..f6e481973 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -192,7 +192,7 @@ sub write_preload_conf {
push @l, 'nvram' if $is_laptop;
push @l, map { $_->{driver} } detect_devices::probe_category($_) foreach qw(multimedia/dvb multimedia/tv various/agpgart various/laptop input/joystick various/crypto disk/card_reader);
push @l, 'padlock-aes', 'padlock-sha' if cat_("/proc/cpuinfo") =~ /rng_en/;
- push @l, 'evdev' if any { $_->{Synaptics} || $_->{ALPS} || $_->{HWHEEL} } detect_devices::getInputDevices();
+ push @l, 'evdev' if any { $_->{Synaptics} || $_->{ALPS} || $_->{Elantech} || $_->{HWHEEL} } detect_devices::getInputDevices();
push @l, 'hdaps' if $is_laptop && $manufacturer eq 'LENOVO';
append_to_modules_loaded_at_startup("$::prefix/etc/modprobe.preload", @l);
}