[backfire] merge r27646

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

diff --git a/target/linux/uml/config/i386 b/target/linux/uml/config/i386
index 748df034acf240dbdf9af3be9bfc2f7fbcddfc16..e1715c317af559a8722f6effa7e165017d0cb4a3 100644 (file)
--- a/target/linux/uml/config/i386
+++ b/target/linux/uml/config/i386
@@ -15,6 +15,7 @@ CONFIG_CLASSIC_RCU=y
 CONFIG_CON_CHAN="xterm"
 CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
 CONFIG_CRAMFS=y
+# CONFIG_CRASHLOG is not set
 # CONFIG_CRYPTO_AES_586 is not set
 # CONFIG_CRYPTO_SALSA20_586 is not set
 # CONFIG_CRYPTO_TWOFISH_586 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_PCI is not set