UBUNTU: [Config] s390x -- CONFIG_ECRYPT_FS=y

Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 73659e68f5a93bab0ddf1630872e94bccc9c1694..49bb6b4c9529a8825914b4886da6d6b06e58fbfa 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -132,7 +132,6 @@ CONFIG_DS1682=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
-CONFIG_ECRYPT_FS=y
 CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_AT24=m
 CONFIG_EEPROM_LEGACY=m

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 3b630c742e16ecdf8e21860713f2a9c5f849516b..df3070794ad200ec54e13301e64b804d87f325b0 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -146,7 +146,6 @@ CONFIG_DS1682=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
-CONFIG_ECRYPT_FS=y
 CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_AT24=m
 CONFIG_EEPROM_LEGACY=m

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 138fc96fd21d3138630c90ba1aadf22523db2a1f..5b12e94096e0a341cf2c22a8b87087aeb58bf78e 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -138,7 +138,6 @@ CONFIG_DS1682=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
-CONFIG_ECRYPT_FS=y
 CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_AT24=m
 CONFIG_EEPROM_LEGACY=m

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index ebb9f389e1a4aa3b28ae1ad07e8bfa253cc3102d..e968279183e15b2e81bffafadd1868727494f0d8 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2297,6 +2297,7 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_EARLY_PRINTK_DBGP=y
 CONFIG_EARLY_PRINTK_EFI=y
 CONFIG_EBC_C384_WDT=m
+CONFIG_ECRYPT_FS=y
 CONFIG_ECRYPT_FS_MESSAGING=y
 CONFIG_EDAC=y
 CONFIG_EDAC_AMD64=m

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 44d8cbb89a44c9477745add54068b2abf0a01cdd..dbbe36a49a1c710b08b83a9780b3e93fc2e15fbd 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -129,7 +129,6 @@ CONFIG_DS1682=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
-CONFIG_ECRYPT_FS=y
 CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_AT24=m
 CONFIG_EEPROM_LEGACY=m

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index acf08e75444a7e82d3d0411b04c34a9ae8478e9e..cf3a328b8b92347300ed9c15efafe921cd440e9e 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -115,7 +115,6 @@ CONFIG_DS1682=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
-CONFIG_ECRYPT_FS=y
 CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_AT24=m
 CONFIG_EEPROM_LEGACY=m

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index d2fbe1b3f6dda73a605e4537961b74b8b6aacd43..f701c7cdfe6e5a13c28ad62b9d2c0bf44ecfcbf2 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -128,7 +128,6 @@ CONFIG_DS1682=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
-CONFIG_ECRYPT_FS=y
 CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_AT24=m
 CONFIG_EEPROM_LEGACY=m

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 984d01d285fc42e1602bd5ecea81ab3f0243b57e..4246e24a3949d5646efa6c672283129fed562663 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -115,7 +115,6 @@ CONFIG_DNS_RESOLVER=m
 # CONFIG_DUMMY_IRQ is not set
 # CONFIG_DW_WATCHDOG is not set
 # CONFIG_ECHO is not set
-CONFIG_ECRYPT_FS=m
 # CONFIG_EEPROM_93CX6 is not set
 # CONFIG_EEPROM_AT24 is not set
 # CONFIG_EEPROM_LEGACY is not set