diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg
index 5b888487ede11836dbb9850bf2f6a949985210ea..fa4f626b0066f9013b91c8b8a44ae88c08bf2a20 100644
--- a/android/configs/android-base.cfg
+++ b/android/configs/android-base.cfg
@@ -2,6 +2,7 @@
 # CONFIG_INET_LRO is not set
 # CONFIG_MODULES is not set
 # CONFIG_OABI_COMPAT is not set
+# CONFIG_SYSVIPC is not set
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ANDROID_INTF_ALARM_DEV=y
@@ -130,7 +131,6 @@ CONFIG_RT_GROUP_SCHED=y
 CONFIG_STAGING=y
 CONFIG_SWITCH=y
 CONFIG_SYNC=y
-CONFIG_SYSVIPC=y
 CONFIG_TUN=y
 CONFIG_UNIX=y
 CONFIG_USB_GADGET=y
diff --git a/arch/arm/configs/sparrow_user_msm8226-perf_defconfig b/arch/arm/configs/sparrow_user_msm8226-perf_defconfig
index 2aeb1787920d3d244687fb18e46f6dcea73da201..684f3965bf481ae6f195ef04fdf2fe8d55fea613 100644
--- a/arch/arm/configs/sparrow_user_msm8226-perf_defconfig
+++ b/arch/arm/configs/sparrow_user_msm8226-perf_defconfig
@@ -1,5 +1,5 @@
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
-CONFIG_SYSVIPC=y
+# CONFIG_SYSVIPC is not set
 CONFIG_AUDIT=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
diff --git a/arch/arm/configs/sparrow_userdebug_msm8226_defconfig b/arch/arm/configs/sparrow_userdebug_msm8226_defconfig
index e9bc021c86e67a56c3a6bfa0fa3e2a4db562e611..8999bb6028c6ec4646788376d9a1853930823282 100644
--- a/arch/arm/configs/sparrow_userdebug_msm8226_defconfig
+++ b/arch/arm/configs/sparrow_userdebug_msm8226_defconfig
@@ -1,5 +1,5 @@
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
-CONFIG_SYSVIPC=y
+# CONFIG_SYSVIPC is not set
 CONFIG_AUDIT=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
diff --git a/arch/arm/configs/wren_user_msm8226-perf_defconfig b/arch/arm/configs/wren_user_msm8226-perf_defconfig
index cd9d406e74790a5c0be3304a58b0126b996782c7..2f1f5bb679528d705c1a9284425947d00087981e 100644
--- a/arch/arm/configs/wren_user_msm8226-perf_defconfig
+++ b/arch/arm/configs/wren_user_msm8226-perf_defconfig
@@ -1,5 +1,5 @@
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
-CONFIG_SYSVIPC=y
+# CONFIG_SYSVIPC is not set
 CONFIG_AUDIT=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
diff --git a/arch/arm/configs/wren_userdebug_msm8226_defconfig b/arch/arm/configs/wren_userdebug_msm8226_defconfig
index e3a9ee491a312ff5cbbe2c6e5f64f31e021b9300..05ebc4b68829f1b33f9b0f5869b781dd309e946f 100644
--- a/arch/arm/configs/wren_userdebug_msm8226_defconfig
+++ b/arch/arm/configs/wren_userdebug_msm8226_defconfig
@@ -1,5 +1,5 @@
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
-CONFIG_SYSVIPC=y
+# CONFIG_SYSVIPC is not set
 CONFIG_AUDIT=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y