orion: Update Orion in trunk to kernel 2.6.34.

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

diff --git a/target/linux/uml/config/i386 b/target/linux/uml/config/i386
index 748df03..2890d1b 100644 (file)
--- a/target/linux/uml/config/i386
+++ b/target/linux/uml/config/i386
@@ -70,6 +70,7 @@ CONFIG_LZO_DECOMPRESS=m
 # CONFIG_M686 is not set
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_M686 is not set
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MAGIC_SYSRQ=y

+# CONFIG_MATOM is not set

 CONFIG_MCONSOLE=y
 # CONFIG_MCORE2 is not set
 # CONFIG_MCRUSOE is not set
 CONFIG_MCONSOLE=y
 # CONFIG_MCORE2 is not set
 # CONFIG_MCRUSOE is not set


@@ -167,4 +168,3 @@ CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_XADD=y
 CONFIG_XTERM_CHAN=y
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_X86_XADD=y
 CONFIG_XTERM_CHAN=y
 CONFIG_ZONE_DMA_FLAG=0

-# CONFIG_PCI is not set