git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[sfrench/cifs-2.6.git]
/
drivers
/
input
/
misc
/
Kconfig
diff --git
a/drivers/input/misc/Kconfig
b/drivers/input/misc/Kconfig
index c761c0c4f2b86abfe7b2227fd3556414d641a6d0..ca59a2be9bc5344f65389ea7372a7740b74b5343 100644
(file)
--- a/
drivers/input/misc/Kconfig
+++ b/
drivers/input/misc/Kconfig
@@
-411,7
+411,7
@@
config INPUT_YEALINK
usb sound driver, so you might want to enable that as well.
For information about how to use these additional functions, see
usb sound driver, so you might want to enable that as well.
For information about how to use these additional functions, see
- <file:Documentation/input/
yealink.tx
t>.
+ <file:Documentation/input/
devices/yealink.rs
t>.
To compile this driver as a module, choose M here: the module will be
called yealink.
To compile this driver as a module, choose M here: the module will be
called yealink.
@@
-595,7
+595,7
@@
config INPUT_GPIO_ROTARY_ENCODER
depends on GPIOLIB || COMPILE_TEST
help
Say Y here to add support for rotary encoders connected to GPIO lines.
depends on GPIOLIB || COMPILE_TEST
help
Say Y here to add support for rotary encoders connected to GPIO lines.
- Check file:Documentation/input/
rotary-encoder.tx
t for more
+ Check file:Documentation/input/
devices/rotary-encoder.rs
t for more
information.
To compile this driver as a module, choose M here: the
information.
To compile this driver as a module, choose M here: the