Patchwork [1/4] UBUNTU: [Config] Enable CONFIG_ECRYPT_FS=y for ports

login
register
mail settings
Submitter Leann Ogasawara
Date May 24, 2010, 5:50 a.m.
Message ID <1274680257.24569.3473.camel@emiko>
Download mbox | patch
Permalink /patch/53377/
State Accepted
Delegated to: Leann Ogasawara
Headers show

Comments

Leann Ogasawara - May 24, 2010, 5:50 a.m.
>From a3e8b25ee9430911ba7868af07f78bf9c5ee24ba Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Sun, 23 May 2010 09:13:30 -0700
Subject: [PATCH 1/4] UBUNTU: [Config] Enable CONFIG_ECRYPT_FS=y for ports

CONFIG_ECRYPT_FS was inconsistent between config.common.ubuntu and
config.common.ports.  Set CONFIG_ECRYPT_FS=y for ports to make this
config option consistent.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 debian.master/config/config.common.ports |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
index 808b667..924c4ed 100644
--- a/debian.master/config/config.common.ports
+++ b/debian.master/config/config.common.ports
@@ -543,13 +543,13 @@  CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CBC=y
 # CONFIG_CRYPTO_CCM is not set
 CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CRYPTD=m
@@ -557,7 +557,7 @@  CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_DEFLATE=m
 # CONFIG_CRYPTO_DEV_HIFN_795X is not set
-CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_FIPS=y
 # CONFIG_CRYPTO_GCM is not set
@@ -861,7 +861,7 @@  CONFIG_EARLY_PRINTK=y
 # CONFIG_ECHO is not set
 CONFIG_ECONET_AUNUDP=y
 CONFIG_ECONET_NATIVE=y
-CONFIG_ECRYPT_FS=m
+CONFIG_ECRYPT_FS=y
 CONFIG_EDAC=y
 # CONFIG_EDAC_AMD8111 is not set
 # CONFIG_EDAC_AMD8131 is not set