orion: Update Orion in trunk to kernel 2.6.34.

[openwrt.git] / target / linux / uml / config / x86_64

diff --git a/target/linux/uml/config/x86_64 b/target/linux/uml/config/x86_64
index 2801074..8ef700f 100644 (file)
--- a/target/linux/uml/config/x86_64
+++ b/target/linux/uml/config/x86_64
@@ -13,6 +13,7 @@ CONFIG_BLK_DEV_UBD_SYNC=y
 CONFIG_CON_CHAN="xterm"
 CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
 CONFIG_CRAMFS=y
 CONFIG_CON_CHAN="xterm"
 CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
 CONFIG_CRAMFS=y

+# CONFIG_CRYPTO_AES_NI_INTEL is not set

 # CONFIG_CRYPTO_AES_X86_64 is not set
 # CONFIG_CRYPTO_SALSA20_X86_64 is not set
 # CONFIG_CRYPTO_TWOFISH_X86_64 is not set
 # CONFIG_CRYPTO_AES_X86_64 is not set
 # CONFIG_CRYPTO_SALSA20_X86_64 is not set
 # CONFIG_CRYPTO_TWOFISH_X86_64 is not set


@@ -53,13 +54,15 @@ CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MAGIC_SYSRQ=y

+# CONFIG_MATOM is not set

 CONFIG_MCONSOLE=y
 CONFIG_MCONSOLE=y

-CONFIG_MCORE2=y
+# CONFIG_MCORE2 is not set

 # CONFIG_MINI_FO is not set
 # CONFIG_MMAPPER is not set
 CONFIG_MK8=y
 CONFIG_MODE_SKAS=y
 CONFIG_NEST_LEVEL=0
 # CONFIG_MINI_FO is not set
 # CONFIG_MMAPPER is not set
 CONFIG_MK8=y
 CONFIG_MODE_SKAS=y
 CONFIG_NEST_LEVEL=0

+# CONFIG_NET_NS is not set

 CONFIG_NET_SCH_FIFO=y
 CONFIG_NLS=y
 # CONFIG_NLS_CODEPAGE_850 is not set
 CONFIG_NET_SCH_FIFO=y
 CONFIG_NLS=y
 # CONFIG_NLS_CODEPAGE_850 is not set