aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/uml/config
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2009-08-16 10:18:07 +0000
committerNicolas Thill <nico@openwrt.org>2009-08-16 10:18:07 +0000
commit0eeb0d3c2f9029e2be2ea36e218ac3052cb88e08 (patch)
treef3aebaad2d3424b15b4faecc63597bdd4d1d86dc /target/linux/uml/config
parent149f92b47ac87199df6c81e5ca90b6d47e5359da (diff)
downloadupstream-0eeb0d3c2f9029e2be2ea36e218ac3052cb88e08.tar.gz
upstream-0eeb0d3c2f9029e2be2ea36e218ac3052cb88e08.tar.bz2
upstream-0eeb0d3c2f9029e2be2ea36e218ac3052cb88e08.zip
bump to 2.6.30.4, apply fix from [15119] to x86_64
SVN-Revision: 17285
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 bc55df4dcd..b8f78dc7e6 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 2801074e2c..6df42ff3ab 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