diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-15 21:14:11 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-15 21:14:11 +0300 |
| commit | 9682b3dea22190a6fd449d157e3175b0e748684d (patch) | |
| tree | 1b4d01168142fbb006e16b40e669de9737eb69ee /drivers/hid | |
| parent | 20df15783a44a289aaa8c8f83b3f715f9040c9c2 (diff) | |
| parent | 1972d6c0c86dd8620ff9f2811ce875135ffb5405 (diff) | |
| download | linux-9682b3dea22190a6fd449d157e3175b0e748684d.tar.xz | |
Merge branch 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"The usual rocket-science from trivial tree for 4.15"
* 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
MAINTAINERS: relinquish kconfig
MAINTAINERS: Update my email address
treewide: Fix typos in Kconfig
kfifo: Fix comments
init/Kconfig: Fix module signing document location
misc: ibmasm: Return error on error path
HID: logitech-hidpp: fix mistake in printk, "feeback" -> "feedback"
MAINTAINERS: Correct path to uDraw PS3 driver
tracing: Fix doc mistakes in trace sample
tracing: Kconfig text fixes for CONFIG_HWLAT_TRACER
MIPS: Alchemy: Remove reverted CONFIG_NETLINK_MMAP from db1xxx_defconfig
mm/huge_memory.c: fixup grammar in comment
lib/xz: Add fall-through comments to a switch statement
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-logitech-hidpp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index 614054af904a..19cc980eebce 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -1957,7 +1957,8 @@ static int hidpp_ff_init(struct hidpp_device *hidpp, u8 feature_index) /* initialize with zero autocenter to get wheel in usable state */ hidpp_ff_set_autocenter(dev, 0); - hid_info(hid, "Force feeback support loaded (firmware release %d).\n", version); + hid_info(hid, "Force feedback support loaded (firmware release %d).\n", + version); return 0; } |