aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2007-05-27 18:28:28 +0000
committerFlorian Fainelli <florian@openwrt.org>2007-05-27 18:28:28 +0000
commite0c7c1c4409f906225955eaaaa86cad0a2f02f84 (patch)
treeab678160641b18d3f8b2a1a8e9bc0333f81524f3
parent46bef81b5fd56967a2c6f6f074bc31ea2ecdfe6e (diff)
downloadupstream-e0c7c1c4409f906225955eaaaa86cad0a2f02f84.tar.gz
upstream-e0c7c1c4409f906225955eaaaa86cad0a2f02f84.tar.bz2
upstream-e0c7c1c4409f906225955eaaaa86cad0a2f02f84.zip
Resync uml with generic-2.6 kernel config
SVN-Revision: 7356
-rw-r--r--target/linux/uml-2.6/config/x86_6411
1 files changed, 8 insertions, 3 deletions
diff --git a/target/linux/uml-2.6/config/x86_64 b/target/linux/uml-2.6/config/x86_64
index 12f1a105d4..615c7c43ae 100644
--- a/target/linux/uml-2.6/config/x86_64
+++ b/target/linux/uml-2.6/config/x86_64
@@ -5,6 +5,7 @@ CONFIG_64BIT=y
# CONFIG_ATM is not set
CONFIG_BASE_SMALL=0
CONFIG_BINFMT_MISC=m
+CONFIG_BITREVERSE=y
CONFIG_BLK_DEV_COW_COMMON=y
CONFIG_BLK_DEV_UBD=y
CONFIG_BLK_DEV_UBD_SYNC=y
@@ -14,6 +15,7 @@ CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
CONFIG_CRAMFS=y
# CONFIG_CRYPTO_AES_X86_64 is not set
# CONFIG_CRYPTO_TWOFISH_X86_64 is not set
+CONFIG_DEBUG_BUGVERBOSE=y
CONFIG_DEFAULT_AS=y
# CONFIG_DEFAULT_DEADLINE is not set
CONFIG_DEFAULT_IOSCHED="anticipatory"
@@ -25,6 +27,7 @@ CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_FS_POSIX_ACL=y
# CONFIG_FW_LOADER is not set
+CONFIG_GENERIC_BUG=y
# CONFIG_HAMRADIO is not set
CONFIG_HOSTAUDIO=m
CONFIG_HOSTFS=y
@@ -41,7 +44,6 @@ CONFIG_JBD=y
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_EXTRA_PASS=y
CONFIG_KERNEL_STACK_ORDER=2
-CONFIG_LBD=y
CONFIG_LD_SCRIPT_STATIC=y
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
@@ -55,6 +57,7 @@ CONFIG_NEST_LEVEL=0
# CONFIG_NET_RADIO is not set
CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
# CONFIG_NET_SCH_CLK_JIFFIES is not set
+CONFIG_NET_SCH_FIFO=y
CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3_ACL=y
# CONFIG_NFSD_V4 is not set
@@ -66,6 +69,7 @@ CONFIG_NLS=y
# CONFIG_NLS_ISO8859_15 is not set
# CONFIG_NLS_KOI8_R is not set
# CONFIG_NOCONFIG_CHAN is not set
+CONFIG_NO_IOMEM=y
CONFIG_NULL_CHAN=y
CONFIG_PORT_CHAN=y
CONFIG_POSIX_MQUEUE=y
@@ -84,12 +88,14 @@ CONFIG_SOFT_WATCHDOG=m
CONFIG_SQUASHFS_EMBEDDED=y
CONFIG_SSL=y
CONFIG_SSL_CHAN="pty"
+# CONFIG_STACKTRACE_SUPPORT is not set
CONFIG_STATIC_LINK=y
CONFIG_STDERR_CONSOLE=y
CONFIG_STDIO_CONSOLE=y
CONFIG_STUB_CODE=0x7fbfffe000
CONFIG_STUB_DATA=0x7fbffff000
CONFIG_STUB_START=0x7fbfffe000
+CONFIG_SYSVIPC_SYSCTL=y
CONFIG_TOP_ADDR=0x80000000
# CONFIG_TRACE_IRQFLAGS_SUPPORT is not set
CONFIG_TTY_CHAN=y
@@ -109,8 +115,7 @@ CONFIG_UML_SOUND=m
CONFIG_UML_WATCHDOG=m
CONFIG_UML_X86=y
# CONFIG_UNUSED_SYMBOLS is not set
-CONFIG_UNWIND_INFO=y
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_XTERM_CHAN=y
-CONFIG_ZISOFS_FS=y
CONFIG_ZLIB_DEFLATE=m
+CONFIG_ZONE_DMA_FLAG=0