aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/uml/config
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2015-03-22 12:36:57 +0000
committerNicolas Thill <nico@openwrt.org>2015-03-22 12:36:57 +0000
commit577da84c2583f114e1b314475f70b2382a375211 (patch)
tree869aa478e7878290a751b1adc98faa76dc2e9752 /target/linux/uml/config
parent223468546da753b4d98479de2fc74e5a5d70edb3 (diff)
downloadupstream-577da84c2583f114e1b314475f70b2382a375211.tar.gz
upstream-577da84c2583f114e1b314475f70b2382a375211.tar.bz2
upstream-577da84c2583f114e1b314475f70b2382a375211.zip
uml: bump to 3.18
Signed-off-by: Nicolas Thill <nico@openwrt.org> SVN-Revision: 44937
Diffstat (limited to 'target/linux/uml/config')
-rw-r--r--target/linux/uml/config/x86_643
1 files changed, 3 insertions, 0 deletions
diff --git a/target/linux/uml/config/x86_64 b/target/linux/uml/config/x86_64
index 203ba4b05c..d23612ea05 100644
--- a/target/linux/uml/config/x86_64
+++ b/target/linux/uml/config/x86_64
@@ -21,6 +21,8 @@ CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
# CONFIG_CRYPTO_SALSA20_X86_64 is not set
CONFIG_CRYPTO_SHA1=y
+# CONFIG_CRYPTO_SKEIN is not set
+# CONFIG_CRYPTO_THREEFISH is not set
# CONFIG_CRYPTO_TWOFISH_X86_64 is not set
CONFIG_DEBUG_BUGVERBOSE=y
CONFIG_DEBUG_MEMORY_INIT=y
@@ -135,6 +137,7 @@ CONFIG_UML_RANDOM=y
CONFIG_UML_SOUND=m
CONFIG_UML_WATCHDOG=m
CONFIG_UML_X86=y
+# CONFIG_UNISYSSPAR is not set
# CONFIG_USB_ARCH_HAS_EHCI is not set
# CONFIG_USB_ARCH_HAS_OHCI is not set
# CONFIG_USB_ARCH_HAS_XHCI is not set