summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2016-01-11 00:20:06 +0200
committerThomas Backlund <tmb@mageia.org>2016-09-25 12:23:38 +0300
commit2161b7f17001075b4e4001b7164f6fd01a968d8e (patch)
treef1b201b8e3d3bf9748c111c94677ba6c3085659c
parent702d29f6870df811f1193c14c8b1f238500b98ae (diff)
downloaddrakx-2161b7f17001075b4e4001b7164f6fd01a968d8e.tar
drakx-2161b7f17001075b4e4001b7164f6fd01a968d8e.tar.gz
drakx-2161b7f17001075b4e4001b7164f6fd01a968d8e.tar.bz2
drakx-2161b7f17001075b4e4001b7164f6fd01a968d8e.tar.xz
drakx-2161b7f17001075b4e4001b7164f6fd01a968d8e.zip
psmouse is now modular, so add it to list_modules.pm (mga#17470)
(cherry picked from commit 3ecd99eeabe9ac660bf181ab49c363c679540395)
-rw-r--r--images/NEWS1
-rw-r--r--kernel/list_modules.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/images/NEWS b/images/NEWS
index ab45d790e..0767f213e 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,4 @@
+- psmouse is now modular, so add it to list_modules.pm (mga#17470)
- sync with kernel-4.4
- sync with kernel-4.3
- sync with kernel-4.1
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index f5a402fb1..7d8e00ea6 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -291,7 +291,7 @@ our %l = (
qw(async_memcpy async_pq async_raid6_recov async_tx async_xor raid6_pq xor),
],
mouse => [
- qw(atixlmouse busmouse generic_serial inport ioc3_serial logibm logibusmouse msbusmouse pcips2 qpmouse synclinkmp),
+ qw(atixlmouse busmouse generic_serial inport ioc3_serial logibm logibusmouse msbusmouse psmouse pcips2 qpmouse synclinkmp),
qw(mousedev usbhid usbmouse synaptics_usb),
],
char => [