[ipset] Update ipset to version 3.2

[openwrt.git] / target / linux / uml / config / x86_64

diff --git a/target/linux/uml/config/x86_64 b/target/linux/uml/config/x86_64
index af9ad20..6df42ff 100644 (file)
--- 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_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
 # CONFIG_CRYPTO_AES_X86_64 is not set
 # CONFIG_CRYPTO_SALSA20_X86_64 is not set
 # CONFIG_CRYPTO_TWOFISH_X86_64 is not set


@@ -54,11 +55,13 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MCONSOLE=y
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MCONSOLE=y

+CONFIG_MCORE2=y

 # CONFIG_MINI_FO is not set
 # CONFIG_MMAPPER is not set
 CONFIG_MK8=y
 CONFIG_MODE_SKAS=y
 CONFIG_NEST_LEVEL=0
 # CONFIG_MINI_FO is not set
 # CONFIG_MMAPPER is not set
 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
 CONFIG_NET_SCH_FIFO=y
 CONFIG_NLS=y
 # CONFIG_NLS_CODEPAGE_850 is not set


@@ -81,6 +84,8 @@ CONFIG_RESOURCES_64BIT=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SEMAPHORE_SLEEPERS=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SEMAPHORE_SLEEPERS=y

+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set

 CONFIG_SMP_BROKEN=y
 CONFIG_SOFT_WATCHDOG=m
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SMP_BROKEN=y
 CONFIG_SOFT_WATCHDOG=m
 # CONFIG_SPARSEMEM_STATIC is not set