diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-09-27 14:03:07 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-09-27 14:03:07 +0000 |
| commit | b95218576ac49d2e496142b81d332309c1b27905 (patch) | |
| tree | bf47450febcdee44a9628b8d8071b2e94cb33069 | |
| parent | e3cc29df21c71c624996b20299c8a4139f445692 (diff) | |
| download | drakx-backup-do-not-use-b95218576ac49d2e496142b81d332309c1b27905.tar drakx-backup-do-not-use-b95218576ac49d2e496142b81d332309c1b27905.tar.gz drakx-backup-do-not-use-b95218576ac49d2e496142b81d332309c1b27905.tar.bz2 drakx-backup-do-not-use-b95218576ac49d2e496142b81d332309c1b27905.tar.xz drakx-backup-do-not-use-b95218576ac49d2e496142b81d332309c1b27905.zip | |
use input/mice instead of psaux for synaptics touchpads (#11771)
(input/mice won't work with 2.4 kernels, but it doesn't matter since
the config file is rewritten at boot on major kernel change, and
synaptics devices are not configured for 2.4 kernels)
| -rw-r--r-- | perl-install/mouse.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm index 959188276..3430c2713 100644 --- a/perl-install/mouse.pm +++ b/perl-install/mouse.pm @@ -32,9 +32,9 @@ my %mice = [ 5, 'ps/2', 'MouseManPlusPS/2', N_("Logitech MouseMan+") ], [ 5, 'imps2', 'IMPS/2', N_("Generic PS2 Wheel Mouse") ], [ 5, 'ps/2', 'GlidePointPS/2', N_("GlidePoint") ], - c::kernel_version() =~ /^\Q2.6/ ? - [ 5, 'ps/2', 'auto-dev', N_("Synaptics Touchpad") ] : - [ 5, 'imps2', 'auto', N_("Automatic") ], + if_(c::kernel_version() !~ /^\Q2.6/, + [ 5, 'imps2', 'auto', N_("Automatic") ] + ), '', [ 5, 'ps/2', 'ThinkingMousePS/2', N_("Kensington Thinking Mouse") ], [ 5, 'netmouse', 'NetMousePS/2', N_("Genius NetMouse") ], @@ -86,6 +86,7 @@ my %mice = N_("Universal") => [ [ 'input/mice' ], [ [ 7, 'ps/2', 'ExplorerPS/2', N_("Any PS/2 & USB mice") ], + [ 5, 'ps/2', 'auto-dev', N_("Synaptics Touchpad") ], ] ], ), |