diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 13:29:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 13:29:16 -0700 |
| commit | 6adc19fd13f11883c44df67b551cf8201e6bba1d (patch) | |
| tree | 455e80aca7b57b17069fab252261c4dcae44374d /drivers/nfc/nxp-nci/Kconfig | |
| parent | 3df83e164f1f39c614a3f31e39164756945ae2ea (diff) | |
| parent | a7f7f6248d9740d710fd6bd190293fe5e16410ac (diff) | |
| download | linux-6adc19fd13f11883c44df67b551cf8201e6bba1d.tar.bz2 | |
Merge tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull more Kbuild updates from Masahiro Yamada:
- fix build rules in binderfs sample
- fix build errors when Kbuild recurses to the top Makefile
- covert '---help---' in Kconfig to 'help'
* tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
treewide: replace '---help---' in Kconfig files with 'help'
kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables
samples: binderfs: really compile this sample and fix build issues
Diffstat (limited to 'drivers/nfc/nxp-nci/Kconfig')
| -rw-r--r-- | drivers/nfc/nxp-nci/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nfc/nxp-nci/Kconfig b/drivers/nfc/nxp-nci/Kconfig index e1f71deab6fc..ab6db98b495d 100644 --- a/drivers/nfc/nxp-nci/Kconfig +++ b/drivers/nfc/nxp-nci/Kconfig @@ -2,7 +2,7 @@ config NFC_NXP_NCI tristate "NXP-NCI NFC driver" depends on NFC_NCI - ---help--- + help Generic core driver for NXP NCI chips such as the NPC100 (PN547), NPC300 (PN548) or PN7150 families. This is a driver based on the NCI NFC kernel layers and @@ -15,7 +15,7 @@ config NFC_NXP_NCI config NFC_NXP_NCI_I2C tristate "NXP-NCI I2C support" depends on NFC_NXP_NCI && I2C - ---help--- + help This module adds support for an I2C interface to the NXP NCI chips. Select this if your platform is using the I2C bus. |