[PATCH 1/8] UBUNTU: [Config] CONFIG_ECRYPT_FS=y

[Tyler Hicks]

eCryptfs was not enabled in the i386 goldfish kernel.

Signed-off-by: Tyler Hicks <tyhicks at canonical.com>
---
 debian.goldfish/config/armhf/config.common.armhf | 1 -
 debian.goldfish/config/config.common.ubuntu      | 1 +
 debian.goldfish/config/i386/config.common.i386   | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian.goldfish/config/armhf/config.common.armhf b/debian.goldfish/config/armhf/config.common.armhf
index a8a069fd..5c00a19 100644
--- a/debian.goldfish/config/armhf/config.common.armhf
+++ b/debian.goldfish/config/armhf/config.common.armhf
@@ -48,7 +48,6 @@ CONFIG_DM_ZERO=m
 CONFIG_DRM=m
 CONFIG_DRM_KMS_HELPER=m
 CONFIG_DS1682=m
-CONFIG_ECRYPT_FS=y
 # CONFIG_EEPROM_93CX6 is not set
 CONFIG_EEPROM_AT24=m
 CONFIG_EEPROM_LEGACY=m
diff --git a/debian.goldfish/config/config.common.ubuntu b/debian.goldfish/config/config.common.ubuntu
index 2bd6603..a66ed12 100644
--- a/debian.goldfish/config/config.common.ubuntu
+++ b/debian.goldfish/config/config.common.ubuntu
@@ -793,6 +793,7 @@ CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
 # CONFIG_ECHO is not set
 # CONFIG_ECONET is not set
+CONFIG_ECRYPT_FS=y
 CONFIG_EDAC=y
 # CONFIG_EDAC_DEBUG is not set
 # CONFIG_EDAC_MM_EDAC is not set
diff --git a/debian.goldfish/config/i386/config.common.i386 b/debian.goldfish/config/i386/config.common.i386
index 714321a..e6a059a 100644
--- a/debian.goldfish/config/i386/config.common.i386
+++ b/debian.goldfish/config/i386/config.common.i386
@@ -48,7 +48,6 @@ CONFIG_DM_ZERO=y
 CONFIG_DRM=y
 CONFIG_DRM_KMS_HELPER=y
 # CONFIG_DS1682 is not set
-# CONFIG_ECRYPT_FS is not set
 CONFIG_EEPROM_93CX6=m
 # CONFIG_EEPROM_AT24 is not set
 # CONFIG_EEPROM_LEGACY is not set
-- 
1.9.1