kernel: add SECCOMP to menuconfig

[openwrt/svn-archive/archive.git] / target / linux / generic / config-3.10

diff --git a/target/linux/generic/config-3.10 b/target/linux/generic/config-3.10
index ab72ead9ec3c052b7bf1e953c534ef347f9f4b90..4299c5789564ed75d564e7c298101baf0394f3c1 100644 (file)
--- a/target/linux/generic/config-3.10
+++ b/target/linux/generic/config-3.10
@@ -1972,6 +1972,8 @@ CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware"
 # CONFIG_MTD_SPLIT_LZMA_FW is not set
 # CONFIG_MTD_SPLIT_SEAMA_FW is not set
 # CONFIG_MTD_SPLIT_SQUASHFS_ROOT is not set
+# CONFIG_MTD_SPLIT_TRX_FW is not set
+# CONFIG_MTD_SPLIT_TPLINK_FW is not set
 # CONFIG_MTD_SPLIT_UIMAGE_FW is not set
 # CONFIG_MTD_SST25L is not set
 # CONFIG_MTD_SWAP is not set
@@ -2269,7 +2271,6 @@ CONFIG_NF_CONNTRACK_PROCFS=y
 # CONFIG_NF_NAT_AMANDA is not set
 # CONFIG_NF_NAT_FTP is not set
 # CONFIG_NF_NAT_H323 is not set
-CONFIG_NF_NAT_IPV4=m
 # CONFIG_NF_NAT_IPV6 is not set
 # CONFIG_NF_NAT_IRC is not set
 # CONFIG_NF_NAT_NEEDED is not set
@@ -2890,9 +2891,7 @@ CONFIG_SCSI_PROC_FS=y
 # CONFIG_SCSI_U14_34F is not set
 # CONFIG_SCSI_UFSHCD is not set
 # CONFIG_SCSI_ULTRASTOR is not set
-CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SDIO_UART is not set
-# CONFIG_SECCOMP is not set
 # CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
@@ -3990,6 +3989,7 @@ CONFIG_WLAN=y
 # CONFIG_WL_TI is not set
 # CONFIG_WR_PPMC is not set
 # CONFIG_X25 is not set
+# CONFIG_X86_16BIT is not set
 CONFIG_XFRM=y
 # CONFIG_XFRM_IPCOMP is not set
 # CONFIG_XFRM_MIGRATE is not set