diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-15 10:14:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-15 10:14:11 -0800 |
| commit | 9682b3dea22190a6fd449d157e3175b0e748684d (patch) | |
| tree | 1b4d01168142fbb006e16b40e669de9737eb69ee /drivers/nfc | |
| parent | 20df15783a44a289aaa8c8f83b3f715f9040c9c2 (diff) | |
| parent | 1972d6c0c86dd8620ff9f2811ce875135ffb5405 (diff) | |
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/nfc')
| -rw-r--r-- | drivers/nfc/st-nci/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nfc/st-nci/Kconfig b/drivers/nfc/st-nci/Kconfig index dc9b777d78f6..5c6e21ccb19c 100644 --- a/drivers/nfc/st-nci/Kconfig +++ b/drivers/nfc/st-nci/Kconfig @@ -11,7 +11,7 @@ config NFC_ST_NCI_I2C select NFC_ST_NCI ---help--- This module adds support for an I2C interface to the - STMicroelectronics NFC NCI chips familly. + STMicroelectronics NFC NCI chips family. Select this if your platform is using the i2c bus. If you choose to build a module, it'll be called st-nci_i2c. @@ -23,7 +23,7 @@ config NFC_ST_NCI_SPI select NFC_ST_NCI ---help--- This module adds support for an SPI interface to the - STMicroelectronics NFC NCI chips familly. + STMicroelectronics NFC NCI chips family. Select this if your platform is using the spi bus. If you choose to build a module, it'll be called st-nci_spi. |