summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2016-05-04 10:56:53 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2016-05-04 10:56:55 -0400
commitba418dcee240f750a17628c2e164554973603858 (patch)
tree937afd337b95ab39162cb184d639491d655f9a6e /config-generic
parentc70306a69ba39d8f6dcd47e2ce3f2716a87d7e85 (diff)
downloadkernel-ba418dcee240f750a17628c2e164554973603858.tar.gz
kernel-ba418dcee240f750a17628c2e164554973603858.tar.xz
kernel-ba418dcee240f750a17628c2e164554973603858.zip
Linux v4.6-rc6-113-g83858a701cf3
- Enable NFC_NXP_NCI options (rhbz 1290556)
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic3
1 files changed, 2 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index 344d8f5dc..4a5879d23 100644
--- a/config-generic
+++ b/config-generic
@@ -2112,7 +2112,8 @@ CONFIG_NFC_TRF7970A=m
CONFIG_NFC_ST21NFCA=m
CONFIG_NFC_ST21NFCA_I2C=m
# CONFIG_NFC_ST95HF is not set
-# CONFIG_NFC_NXP_NCI is not set
+CONFIG_NFC_NXP_NCI=m
+CONFIG_NFC_NXP_NCI_I2C=m
# CONFIG_NFC_NCI_SPI is not set
# CONFIG_NFC_NCI_UART is not set
# CONFIG_NFC_ST_NCI is not set