aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/uml
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2008-07-26 18:23:38 +0000
committerFlorian Fainelli <florian@openwrt.org>2008-07-26 18:23:38 +0000
commiteba36b5304dcf55dd59c0d7785bad3fe9cb8e8a5 (patch)
tree91f48ceae5cd34acac8a70b12f9bf5d8b24a9f71 /target/linux/uml
parentc935eddd71c9b53d36e64039071aa19c66a74af8 (diff)
downloadupstream-eba36b5304dcf55dd59c0d7785bad3fe9cb8e8a5.tar.gz
upstream-eba36b5304dcf55dd59c0d7785bad3fe9cb8e8a5.tar.bz2
upstream-eba36b5304dcf55dd59c0d7785bad3fe9cb8e8a5.zip
Resync some kernel configuration options
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11941 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/uml')
-rw-r--r--target/linux/uml/config/i3861
-rw-r--r--target/linux/uml/config/x86_641
2 files changed, 0 insertions, 2 deletions
diff --git a/target/linux/uml/config/i386 b/target/linux/uml/config/i386
index 8084646616..72bf3f2973 100644
--- a/target/linux/uml/config/i386
+++ b/target/linux/uml/config/i386
@@ -166,5 +166,4 @@ CONFIG_X86_USE_PPRO_CHECKSUM=y
CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_XADD=y
CONFIG_XTERM_CHAN=y
-CONFIG_ZLIB_DEFLATE=m
CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/uml/config/x86_64 b/target/linux/uml/config/x86_64
index a992e5f26d..d983e2766a 100644
--- a/target/linux/uml/config/x86_64
+++ b/target/linux/uml/config/x86_64
@@ -111,5 +111,4 @@ CONFIG_UML_X86=y
# CONFIG_UNUSED_SYMBOLS is not set
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_XTERM_CHAN=y
-CONFIG_ZLIB_DEFLATE=m
CONFIG_ZONE_DMA_FLAG=0