diff --git a/arch/arm/configs/swift_user_msm8909w-perf_defconfig b/arch/arm/configs/swift_user_msm8909w-perf_defconfig
index 2d75f0faaef6b6cf3a9dea51c8ef2f648bef8a21..3b86581d5fa58d90c07a4c942a8125144ce1ddf5 100644
--- a/arch/arm/configs/swift_user_msm8909w-perf_defconfig
+++ b/arch/arm/configs/swift_user_msm8909w-perf_defconfig
@@ -453,7 +453,6 @@ CONFIG_MSM_SUBSYSTEM_RESTART=y
 CONFIG_MSM_PIL=y
 CONFIG_MSM_PIL_SSR_GENERIC=y
 CONFIG_MSM_PIL_MSS_QDSP6V5=y
-CONFIG_MSM_CORE_CTL_HELPER=y
 CONFIG_MSM_BAM_DMUX=y
 CONFIG_MSM_PERFORMANCE=y
 # CONFIG_MSM_PERFORMANCE_HOTPLUG_ON is not set
@@ -526,3 +525,7 @@ CONFIG_PSTORE=y
 CONFIG_PSTORE_RAM=y 
 CONFIG_PSTORE_CONSOLE=y
 CONFIG_ASUS_BACKLIGHT_DEBUG=y
+CONFIG_SCHED_CORE_CTL=y
+CONFIG_ARM_CRYPTO=y
+CONFIG_CRYPTO_SHA1_ARM_NEON=y
+CONFIG_CRYPTO_SHA512_ARM_NEON=y
diff --git a/arch/arm/configs/swift_userdebug_msm8909w_defconfig b/arch/arm/configs/swift_userdebug_msm8909w_defconfig
index 0478c3ebc743a0f2778027f22998e16d26d2c314..87675bde67ce359899b86b8a5436f9a25b69a95e 100644
--- a/arch/arm/configs/swift_userdebug_msm8909w_defconfig
+++ b/arch/arm/configs/swift_userdebug_msm8909w_defconfig
@@ -459,7 +459,6 @@ CONFIG_MSM_SUBSYSTEM_RESTART=y
 CONFIG_MSM_PIL=y
 CONFIG_MSM_PIL_SSR_GENERIC=y
 CONFIG_MSM_PIL_MSS_QDSP6V5=y
-CONFIG_MSM_CORE_CTL_HELPER=y
 CONFIG_MSM_BAM_DMUX=y
 CONFIG_MSM_PERFORMANCE=y
 # CONFIG_MSM_PERFORMANCE_HOTPLUG_ON is not set
@@ -559,3 +558,7 @@ CONFIG_PSTORE_RAM=y
 CONFIG_PSTORE_CONSOLE=y
 CONFIG_ASUS_BACKLIGHT_DEBUG=y
 CONFIG_QTI_PP=y
+CONFIG_SCHED_CORE_CTL=y
+CONFIG_ARM_CRYPTO=y
+CONFIG_CRYPTO_SHA1_ARM_NEON=y
+CONFIG_CRYPTO_SHA512_ARM_NEON=y