summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/configs/android_common_defconfig2
-rw-r--r--arch/arm/configs/imx6_android_defconfig2
-rw-r--r--arch/arm/configs/imx6_hdmidongle_android_defconfig2
-rw-r--r--arch/arm/configs/imx6s_android_defconfig2
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/configs/android_common_defconfig b/arch/arm/configs/android_common_defconfig
index a9ab8e4a1157..a7e9b266c000 100644
--- a/arch/arm/configs/android_common_defconfig
+++ b/arch/arm/configs/android_common_defconfig
@@ -227,7 +227,7 @@ CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE=8
CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_POLYNOMIAL=0x11d
CONFIG_ANDROID_TIMED_OUTPUT=y
CONFIG_ANDROID_TIMED_GPIO=y
-CONFIG_ANDROID_RESERVED_MEMORY_ACCOUNT=y
+# CONFIG_ANDROID_RESERVED_MEMORY_ACCOUNT is not set
CONFIG_ANDROID_LOW_MEMORY_KILLER=y
CONFIG_MACH_NO_WESTBRIDGE=y
CONFIG_MXC_GPU_VIV=y
diff --git a/arch/arm/configs/imx6_android_defconfig b/arch/arm/configs/imx6_android_defconfig
index 2a5414501f2d..c8d1df8bbf44 100644
--- a/arch/arm/configs/imx6_android_defconfig
+++ b/arch/arm/configs/imx6_android_defconfig
@@ -2881,7 +2881,7 @@ CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_POLYNOMIAL=0x11d
# CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set
CONFIG_ANDROID_TIMED_OUTPUT=y
CONFIG_ANDROID_TIMED_GPIO=y
-CONFIG_ANDROID_RESERVED_MEMORY_ACCOUNT=y
+#CONFIG_ANDROID_RESERVED_MEMORY_ACCOUNT is not set
CONFIG_ANDROID_LOW_MEMORY_KILLER=y
# CONFIG_POHMELFS is not set
# CONFIG_LINE6_USB is not set
diff --git a/arch/arm/configs/imx6_hdmidongle_android_defconfig b/arch/arm/configs/imx6_hdmidongle_android_defconfig
index 33dbb334de5f..19b1c23c57cd 100644
--- a/arch/arm/configs/imx6_hdmidongle_android_defconfig
+++ b/arch/arm/configs/imx6_hdmidongle_android_defconfig
@@ -2880,7 +2880,7 @@ CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_POLYNOMIAL=0x11d
# CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set
CONFIG_ANDROID_TIMED_OUTPUT=y
CONFIG_ANDROID_TIMED_GPIO=y
-CONFIG_ANDROID_RESERVED_MEMORY_ACCOUNT=y
+# CONFIG_ANDROID_RESERVED_MEMORY_ACCOUNT is not set
CONFIG_ANDROID_LOW_MEMORY_KILLER=y
# CONFIG_POHMELFS is not set
# CONFIG_LINE6_USB is not set
diff --git a/arch/arm/configs/imx6s_android_defconfig b/arch/arm/configs/imx6s_android_defconfig
index 117ab1fd4332..fbfafb97fcb5 100644
--- a/arch/arm/configs/imx6s_android_defconfig
+++ b/arch/arm/configs/imx6s_android_defconfig
@@ -355,7 +355,7 @@ CONFIG_ANDROID_LOGGER=y
CONFIG_ANDROID_RAM_CONSOLE=y
CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION=y
CONFIG_ANDROID_TIMED_GPIO=y
-CONFIG_ANDROID_RESERVED_MEMORY_ACCOUNT=y
+# CONFIG_ANDROID_RESERVED_MEMORY_ACCOUNT is not set
CONFIG_ANDROID_LOW_MEMORY_KILLER=y
# CONFIG_MXC_HMP4E is not set
# CONFIG_MXC_HWEVENT is not set