[backfire] merge r27646

[openwrt-10.03/.git] / target / linux / uml / config / i386

diff --git a/target/linux/uml/config/i386 b/target/linux/uml/config/i386
index 64fd5326f5deaedaa5a2dd8f87d0131886e97020..e1715c317af559a8722f6effa7e165017d0cb4a3 100644 (file)
--- a/target/linux/uml/config/i386
+++ b/target/linux/uml/config/i386
@@ -15,10 +15,8 @@ CONFIG_CLASSIC_RCU=y
 CONFIG_CON_CHAN="xterm"
 CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
 CONFIG_CRAMFS=y
-CONFIG_CRYPTO_AEAD=m
+# CONFIG_CRASHLOG is not set
 # CONFIG_CRYPTO_AES_586 is not set
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_GF128MUL=m
 # CONFIG_CRYPTO_SALSA20_586 is not set
 # CONFIG_CRYPTO_TWOFISH_586 is not set
 CONFIG_DEBUG_BUGVERBOSE=y
@@ -96,6 +94,7 @@ CONFIG_MPENTIUMII=y
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set
 CONFIG_NAMESPACES=y
+# CONFIG_NET_NS is not set
 CONFIG_NLS=y
 # CONFIG_NLS_CODEPAGE_850 is not set
 # CONFIG_NLS_ISO8859_15 is not set