summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-08-05 11:40:34 +0300
committerLennart Poettering <lennart@poettering.net>2015-08-05 11:40:34 +0300
commit2f6dbdb408a4ffe8b223c8baef40538a685ace2d (patch)
tree664d82a9e98d19dedac8c6ffec641e82f385b5c5
parent075b226673c61a5c614f09ba99bd06dd2639474d (diff)
parent1ae2285324e01dc3a2d44d7b1711b939261cc756 (diff)
Merge pull request #864 from phomes/master
hwdb: add Logitech LX8 DPI and wheel click settings
-rw-r--r--hwdb/70-mouse.hwdb5
-rw-r--r--src/gpt-auto-generator/gpt-auto-generator.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/hwdb/70-mouse.hwdb b/hwdb/70-mouse.hwdb
index 680cb1ed7b..4592a449ea 100644
--- a/hwdb/70-mouse.hwdb
+++ b/hwdb/70-mouse.hwdb
@@ -282,6 +282,11 @@ mouse:usb:v046dp4027:name:Logitech T620:
mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:4027:
MOUSE_DPI=1200@250
+# Logitech LX8 Cordless Laser Mouse
+mouse:usb:v046dpc51b:name:Logitech USB Receiver:
+ MOUSE_DPI=1300@125
+ MOUSE_WHEEL_CLICK_ANGLE=15
+
# Logitech ZoneTouch Mouse T400
mouse:usb:v046dp4026:name:Logitech T400:
mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:4026:
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index 50acb7595c..9d889c17d8 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -250,7 +250,7 @@ static int add_automount(
const char *description,
usec_t timeout) {
- _cleanup_free_ char *unit = NULL, *lnk = NULL, *crypto_what = NULL;
+ _cleanup_free_ char *unit = NULL, *lnk = NULL;
_cleanup_free_ char *opt, *p = NULL;
_cleanup_fclose_ FILE *f = NULL;
int r;