diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 23:29:16 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 23:29:16 +0300 |
| commit | 6adc19fd13f11883c44df67b551cf8201e6bba1d (patch) | |
| tree | 455e80aca7b57b17069fab252261c4dcae44374d /drivers/nfc/fdp/Kconfig | |
| parent | 3df83e164f1f39c614a3f31e39164756945ae2ea (diff) | |
| parent | a7f7f6248d9740d710fd6bd190293fe5e16410ac (diff) | |
| download | linux-6adc19fd13f11883c44df67b551cf8201e6bba1d.tar.xz | |
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/fdp/Kconfig')
| -rw-r--r-- | drivers/nfc/fdp/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nfc/fdp/Kconfig b/drivers/nfc/fdp/Kconfig index f575d2aec553..6c51f4af4256 100644 --- a/drivers/nfc/fdp/Kconfig +++ b/drivers/nfc/fdp/Kconfig @@ -4,7 +4,7 @@ config NFC_FDP depends on NFC_NCI select CRC_CCITT default n - ---help--- + help Intel Fields Peak NFC controller core driver. This is a driver based on the NCI NFC kernel layers. @@ -15,7 +15,7 @@ config NFC_FDP config NFC_FDP_I2C tristate "NFC FDP i2c support" depends on NFC_FDP && I2C - ---help--- + help This module adds support for the Intel Fields Peak NFC controller i2c interface. Select this if your platform is using the i2c bus. |