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 d667e89..8ef700f 100644 (file)
--- a/target/linux/uml/config/x86_64
+++ b/target/linux/uml/config/x86_64
@@ -54,8 +54,9 @@ 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_MINI_FO is not set
 # CONFIG_MMAPPER is not set
 CONFIG_MK8=y


@@ -124,4 +125,3 @@ CONFIG_UML_X86=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_XTERM_CHAN=y
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_XTERM_CHAN=y
 CONFIG_ZONE_DMA_FLAG=0

-# CONFIG_PCI is not set