aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2008-07-27 16:56:08 +0000
committerFlorian Fainelli <florian@openwrt.org>2008-07-27 16:56:08 +0000
commitd610ea58d023409ce78cd2989308bce430f53e8c (patch)
tree3097a3c6770474ff9380e35e96e8c523c2dae2a8
parent6fb96b4b63dada57a59b1b762af63c3b1d36f40a (diff)
downloadupstream-d610ea58d023409ce78cd2989308bce430f53e8c.tar.gz
upstream-d610ea58d023409ce78cd2989308bce430f53e8c.tar.bz2
upstream-d610ea58d023409ce78cd2989308bce430f53e8c.zip
Resynced x86_64 kernel config for uml
SVN-Revision: 11962
-rw-r--r--target/linux/uml/config/x86_647
1 files changed, 7 insertions, 0 deletions
diff --git a/target/linux/uml/config/x86_64 b/target/linux/uml/config/x86_64
index d983e2766a..af9ad204f7 100644
--- a/target/linux/uml/config/x86_64
+++ b/target/linux/uml/config/x86_64
@@ -14,8 +14,10 @@ CONFIG_CON_CHAN="xterm"
CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
CONFIG_CRAMFS=y
# 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_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_STACK_USAGE is not set
CONFIG_DEFAULT_AS=y
# CONFIG_DEFAULT_DEADLINE is not set
CONFIG_DEFAULT_IOSCHED="anticipatory"
@@ -54,6 +56,7 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_MCONSOLE=y
# CONFIG_MINI_FO is not set
# CONFIG_MMAPPER is not set
+CONFIG_MK8=y
CONFIG_MODE_SKAS=y
CONFIG_NEST_LEVEL=0
CONFIG_NET_SCH_FIFO=y
@@ -66,11 +69,13 @@ CONFIG_NO_IOMEM=y
CONFIG_NULL_CHAN=y
CONFIG_PORT_CHAN=y
CONFIG_POSIX_MQUEUE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
CONFIG_PTY_CHAN=y
CONFIG_QFMT_V1=y
CONFIG_QFMT_V2=y
CONFIG_QUOTA=y
CONFIG_QUOTACTL=y
+# CONFIG_QUOTA_NETLINK_INTERFACE is not set
CONFIG_RELAY=y
CONFIG_RESOURCES_64BIT=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
@@ -103,12 +108,14 @@ CONFIG_UML_NET_MCAST=y
CONFIG_UML_NET_SLIP=y
CONFIG_UML_NET_SLIRP=y
CONFIG_UML_NET_TUNTAP=y
+# CONFIG_UML_NET_VDE is not set
CONFIG_UML_RANDOM=y
CONFIG_UML_REAL_TIME_CLOCK=y
CONFIG_UML_SOUND=m
CONFIG_UML_WATCHDOG=m
CONFIG_UML_X86=y
# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_USER_NS is not set
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_XTERM_CHAN=y
CONFIG_ZONE_DMA_FLAG=0