--- arch/arm/configs/msm8960_defconfig

+++ arch/arm/configs/msm8960_defconfig

@@ -250,7 +250,6 @@ CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y

CONFIG_NETDEVICES=y

CONFIG_DUMMY=y

-CONFIG_TUN=y

CONFIG_NET_ETHERNET=y

CONFIG_SMC91X=y

CONFIG_SMC911X=y

@@ -472,4 +471,3 @@ CONFIG_CRYPTO_DEV_QCRYPTO=m

CONFIG_CRYPTO_DEV_QCE=m

CONFIG_CRYPTO_DEV_QCEDEV=m

CONFIG_CRC_CCITT=y

-CONFIG_WCNSS_MEM_PRE_ALLOC=y