diff options
author | David S. Miller <davem@davemloft.net> | 2017-07-01 14:30:39 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-07-01 14:30:39 -0700 |
commit | 283131d20edd6f3629bf258e236aa6e44b1a8e27 (patch) | |
tree | 47ffbf798d7f0d87ba2b7cddf0f88ff7b3447cf0 /drivers/nfc/Kconfig | |
parent | 9d46b7701c30b308a3f3765bd33c1e69ccf4d9a2 (diff) | |
parent | bd751808f9ff5e1822c627f6c4283009e66b2e53 (diff) | |
download | linux-283131d20edd6f3629bf258e236aa6e44b1a8e27.tar.gz linux-283131d20edd6f3629bf258e236aa6e44b1a8e27.tar.bz2 linux-283131d20edd6f3629bf258e236aa6e44b1a8e27.zip |
Merge tag 'nfc-next-4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz says:
====================
NFC 4.13 pull request
This is the NFC pull requesy for 4.13. We have:
- A conversion to unified device and GPIO APIs for the
fdp, pn544, and st{21,-nci} drivers.
- A fix for NFC device IDs allocation.
- A fix for the nfcmrvl driver firmware download mechanism.
- A trf7970a DT and GPIO cleanup and clock setting fix.
- A few fixes for potential overflows in the digital and LLCP code.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/nfc/Kconfig')
-rw-r--r-- | drivers/nfc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/Kconfig b/drivers/nfc/Kconfig index c4208487fadc..b065eb605215 100644 --- a/drivers/nfc/Kconfig +++ b/drivers/nfc/Kconfig @@ -7,7 +7,7 @@ menu "Near Field Communication (NFC) devices" config NFC_TRF7970A tristate "Texas Instruments TRF7970a NFC driver" - depends on SPI && NFC_DIGITAL + depends on SPI && NFC_DIGITAL && GPIOLIB help This option enables the NFC driver for Texas Instruments' TRF7970a device. Such device supports 5 different protocols: ISO14443A, |