commit fe4be60c9a70884bc865f9cccf0991b248728b8e
author Linux Build Service Account <lnxbuild@localhost> Mon Oct 14 00:00:39 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Oct 14 00:00:39 2013 -0700
tree 8fec19c16ac1af122c357ca182c86d09c86ecf62
parent 16116c6ae366b247e71adfb17266486185b76263
parent fd2d2e2b7237aa7e40e7dad976b28b6638eef87e

Merge "defconfig: msm8610: enable Qualcomm NFC NCI driver"

arch/arm/configs/msm8610-perf_defconfig

diff --git a/arch/arm/configs/msm8610-perf_defconfig b/arch/arm/configs/msm8610-perf_defconfig
index b91ce3c..c572ad8 100644
--- a/arch/arm/configs/msm8610-perf_defconfig
+++ b/arch/arm/configs/msm8610-perf_defconfig
@@ -412,3 +412,4 @@
 CONFIG_SENSORS_MMA8X5X=y
 CONFIG_LOGCAT_SIZE=64
 CONFIG_SENSORS_CAPELLA_CM36283=y
+CONFIG_NFC_QNCI=y

arch/arm/configs/msm8610_defconfig

diff --git a/arch/arm/configs/msm8610_defconfig b/arch/arm/configs/msm8610_defconfig
index 93e8f0f..6a7097d 100644
--- a/arch/arm/configs/msm8610_defconfig
+++ b/arch/arm/configs/msm8610_defconfig
@@ -443,6 +443,7 @@
 CONFIG_CRYPTO_MD4=y
 CONFIG_CRYPTO_ARC4=y
 CONFIG_CRYPTO_TWOFISH=y
+CONFIG_NFC_QNCI=y
 CONFIG_CRYPTO_DEV_QCRYPTO=m
 CONFIG_CRYPTO_DEV_QCE=y
 CONFIG_CRYPTO_DEV_QCEDEV=m