summaryrefslogtreecommitdiffstats
path: root/target/linux/uml/config
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-16 10:18:07 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-16 10:18:07 +0000
commit591108bddae9fe9e06c962019848c44d722a3880 (patch)
treebab245ca0004c262fa32f8082dfb787e5a096181 /target/linux/uml/config
parent993735e76a12c958cc722267a900d9bb6d3191d4 (diff)
[uml] bump to 2.6.30.4, apply fix from [15119] to x86_64
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17285 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/uml/config')
-rw-r--r--target/linux/uml/config/i3861
-rw-r--r--target/linux/uml/config/x86_642
2 files changed, 3 insertions, 0 deletions
diff --git a/target/linux/uml/config/i386 b/target/linux/uml/config/i386
index bc55df4dc..b8f78dc7e 100644
--- a/target/linux/uml/config/i386
+++ b/target/linux/uml/config/i386
@@ -93,6 +93,7 @@ CONFIG_MPENTIUMII=y
# CONFIG_MWINCHIP3D is not set
# CONFIG_MWINCHIPC6 is not set
CONFIG_NAMESPACES=y
+# CONFIG_NET_NS is not set
CONFIG_NLS=y
# CONFIG_NLS_CODEPAGE_850 is not set
# CONFIG_NLS_ISO8859_15 is not set
diff --git a/target/linux/uml/config/x86_64 b/target/linux/uml/config/x86_64
index 2801074e2..6df42ff3a 100644
--- 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_CRYPTO_AES_NI_INTEL is not set
# CONFIG_CRYPTO_AES_X86_64 is not set
# CONFIG_CRYPTO_SALSA20_X86_64 is not set
# CONFIG_CRYPTO_TWOFISH_X86_64 is not set
@@ -60,6 +61,7 @@ CONFIG_MCORE2=y
CONFIG_MK8=y
CONFIG_MODE_SKAS=y
CONFIG_NEST_LEVEL=0
+# CONFIG_NET_NS is not set
CONFIG_NET_SCH_FIFO=y
CONFIG_NLS=y
# CONFIG_NLS_CODEPAGE_850 is not set