7 files changed, 1 insertions, 6 deletions
diff --git a/chromeos/config/armel/chromeos-exynos5.flavour.config b/chromeos/config/armel/chromeos-exynos5.flavour.config
index 2f8e1dbb3167..e922dcf3755a 100644
--- a/chromeos/config/armel/chromeos-exynos5.flavour.config
+++ b/chromeos/config/armel/chromeos-exynos5.flavour.config
@@ -161,7 +161,6 @@ CONFIG_DRM_KMS_HELPER=y
 # CONFIG_DW_DMAC is not set
 # CONFIG_DW_WATCHDOG is not set
 CONFIG_EARLY_PRINTK=y
-CONFIG_ECRYPT_FS=y
 CONFIG_ELF_CORE=y
 # CONFIG_EVM is not set
 CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
diff --git a/chromeos/config/armel/chromeos-tegra2.flavour.config b/chromeos/config/armel/chromeos-tegra2.flavour.config
index 0573464b9d68..098af9353a42 100644
--- a/chromeos/config/armel/chromeos-tegra2.flavour.config
+++ b/chromeos/config/armel/chromeos-tegra2.flavour.config
@@ -185,7 +185,6 @@ CONFIG_DM_VERITY=y
 # CONFIG_E1000 is not set
 # CONFIG_E1000E is not set
 CONFIG_EARLY_PRINTK=y
-CONFIG_ECRYPT_FS=y
 CONFIG_ELF_CORE=y
 # CONFIG_ENIC is not set
 # CONFIG_EPIC100 is not set
diff --git a/chromeos/config/armel/chromeos-tegra3.flavour.config b/chromeos/config/armel/chromeos-tegra3.flavour.config
index 6d4d1f4a721b..77c46b956fe0 100644
--- a/chromeos/config/armel/chromeos-tegra3.flavour.config
+++ b/chromeos/config/armel/chromeos-tegra3.flavour.config
@@ -221,7 +221,6 @@ CONFIG_DUMMY=y
 # CONFIG_E1000 is not set
 # CONFIG_E1000E is not set
 # CONFIG_EARLY_PRINTK is not set
-# CONFIG_ECRYPT_FS is not set
 # CONFIG_ELF_CORE is not set
 # CONFIG_ENIC is not set
 # CONFIG_EPIC100 is not set
diff --git a/chromeos/config/armel/chromiumos-arm.flavour.config b/chromeos/config/armel/chromiumos-arm.flavour.config
index 53878ead5786..a30579abc787 100644
--- a/chromeos/config/armel/chromiumos-arm.flavour.config
+++ b/chromeos/config/armel/chromiumos-arm.flavour.config
@@ -185,7 +185,6 @@ CONFIG_DM_VERITY=y
 # CONFIG_E1000 is not set
 # CONFIG_E1000E is not set
 CONFIG_EARLY_PRINTK=y
-CONFIG_ECRYPT_FS=y
 CONFIG_ELF_CORE=y
 # CONFIG_ENIC is not set
 # CONFIG_EPIC100 is not set
diff --git a/chromeos/config/base.config b/chromeos/config/base.config
index 290345c6a590..af48e28855b6 100644
--- a/chromeos/config/base.config
+++ b/chromeos/config/base.config
@@ -321,6 +321,7 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_DYNAMIC_FTRACE=y
 # CONFIG_ECHO is not set
 # CONFIG_ECONET is not set
+CONFIG_ECRYPT_FS=y
 # CONFIG_EEPROM_93XX46 is not set
 # CONFIG_EEPROM_AT24 is not set
 # CONFIG_EEPROM_AT25 is not set
diff --git a/chromeos/config/i386/common.config b/chromeos/config/i386/common.config
index 371e48f07d19..6c2ffc110023 100644
--- a/chromeos/config/i386/common.config
+++ b/chromeos/config/i386/common.config
@@ -284,7 +284,6 @@ CONFIG_E1000=m
 CONFIG_E1000E=m
 CONFIG_EARLY_PRINTK=y
 CONFIG_EARLY_PRINTK_DBGP=y
-CONFIG_ECRYPT_FS=y
 # CONFIG_EDAC is not set
 # CONFIG_EDD is not set
 # CONFIG_EEEPC_LAPTOP is not set
diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config
index 8ac80e74f58f..fb34b07dfeb6 100644
--- a/chromeos/config/x86_64/common.config
+++ b/chromeos/config/x86_64/common.config
@@ -301,7 +301,6 @@ CONFIG_E1000=m
 CONFIG_E1000E=m
 CONFIG_EARLY_PRINTK=y
 CONFIG_EARLY_PRINTK_DBGP=y
-CONFIG_ECRYPT_FS=y
 # CONFIG_EDAC is not set
 # CONFIG_EDD is not set
 # CONFIG_EEEPC_LAPTOP is not set