commit e5cbb67c43c4a1ae702b186e875f76fdb0197a27
author Linux Build Service Account <lnxbuild@localhost> Thu Dec 05 22:29:14 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Dec 05 22:29:14 2013 -0800
tree c604c87249e694f76c1c087513909c81ca7ad825
parent 53e1ba93c659cde5506d03c582b9f7540c909f48
parent 959480bf804209f9d9ad208362ae39a13fb7bf4e

Merge "defconfig: msm8974: Add NFC for 8974 devices"

arch/arm/configs/msm8974-perf_defconfig

diff --git a/arch/arm/configs/msm8974-perf_defconfig b/arch/arm/configs/msm8974-perf_defconfig
old mode 100644
new mode 100755
index 76117b0..7f59ae4
--- a/arch/arm/configs/msm8974-perf_defconfig
+++ b/arch/arm/configs/msm8974-perf_defconfig
@@ -496,6 +496,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=y

arch/arm/configs/msm8974_defconfig

diff --git a/arch/arm/configs/msm8974_defconfig b/arch/arm/configs/msm8974_defconfig
old mode 100644
new mode 100755
index b57504c..387308f
--- a/arch/arm/configs/msm8974_defconfig
+++ b/arch/arm/configs/msm8974_defconfig
@@ -536,6 +536,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=y