[backfire] merge r27646

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

diff --git a/target/linux/uml/config/x86_64 b/target/linux/uml/config/x86_64
index d667e891751b6a9ad7babfec9ead2577dd0eb637..66c1c4b8df0b98fb2027b7d3f229081ca40486c8 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_CRASHLOG is not set
 # CONFIG_CRYPTO_AES_NI_INTEL is not set
 # CONFIG_CRYPTO_AES_X86_64 is not set
 # CONFIG_CRYPTO_SALSA20_X86_64 is not set
@@ -54,8 +55,9 @@ CONFIG_LEGACY_PTYS=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_MCORE2=y
+# CONFIG_MCORE2 is not set
 # CONFIG_MINI_FO is not set
 # CONFIG_MMAPPER is not set
 CONFIG_MK8=y
@@ -124,4 +126,3 @@ CONFIG_UML_X86=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_XTERM_CHAN=y
 CONFIG_ZONE_DMA_FLAG=0
-# CONFIG_PCI is not set