diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-01 14:52:59 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-01 14:52:59 -0700 |
commit | 69c1fd97266bcdcfdba1e3ea57773c80e0551e1a (patch) | |
tree | d7c316d623fa703b9d268c2a4d3624f5a7de988b /drivers/hid | |
parent | 72f35423e8a6a2451c202f52cb8adb92b08592ec (diff) | |
parent | fad7c9020948eab2bc4661eade4e1ef357279590 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"My attempt to revitalize trivial queue I've been neglecting for years
(what a disaster that was for this world, right? :) ) with patches
collected from backlog that were still relevant and not applied
elsewhere in the meantime"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
err.h: remove deprecated PTR_RET for good
blk-mq: Fix typo in comment
x86/boot: Fix comment spelling
sh: mach-highlander: Fix comment spelling
s390/dasd: Fix comment spelling
mfd: wm8994: Fix comment spelling
docs: Add reference in binfmt-misc.rst
genirq: fix kerneldoc comment for irq_desc
drm/amdgpu: fix two documentation mismatch issues
HID: fix Kconfig word ordering
list/hashtable: minor documentation corrections.
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 494a39e74939..5d1b77db6dc2 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -1039,7 +1039,7 @@ config HID_U2FZERO U2F Zero only supports blinking its LED, so this driver doesn't allow setting the brightness to anything but 1, which will - trigger a single blink and immediately reset to back 0. + trigger a single blink and immediately reset back to 0. config HID_WACOM tristate "Wacom Intuos/Graphire tablet support (USB)" |