X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fconfig-3.10;h=7b1444986a556f5d2806acb4ee77a4b7948764e4;hb=5e87565b70e913da263af2034d52d9256ab78423;hp=2d97df8d614b085b04c889aed5d9637436f4ad55;hpb=8389d24e64a1fe2510a3a5351dcca8ec31e1f43c;p=openwrt.git

diff --git a/target/linux/generic/config-3.10 b/target/linux/generic/config-3.10
index 2d97df8d61..7b1444986a 100644
--- a/target/linux/generic/config-3.10
+++ b/target/linux/generic/config-3.10
@@ -145,6 +145,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
 # CONFIG_ARCH_MVEBU is not set
 # CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_MXS is not set
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_NOMADIK is not set
 # CONFIG_ARCH_NUC93X is not set
@@ -521,12 +522,12 @@ CONFIG_CAVIUM_OCTEON_HELPER=y
 # CONFIG_CHR_DEV_ST is not set
 # CONFIG_CICADA_PHY is not set
 # CONFIG_CIFS is not set
+# CONFIG_CIFS_ACL is not set
 # CONFIG_CIFS_DEBUG is not set
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_FSCACHE is not set
 # CONFIG_CIFS_NFSD_EXPORT is not set
 CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_ACL is not set
 # CONFIG_CIFS_SMB2 is not set
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
@@ -882,6 +883,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FB_I740 is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMX is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
 # CONFIG_FB_MACMODES is not set
@@ -1016,7 +1018,7 @@ CONFIG_GENERIC_TIME=y
 # CONFIG_GPIO_XILINX is not set
 # CONFIG_GREENASIA_FF is not set
 # CONFIG_HAMACHI is not set
-CONFIG_HAMRADIO=y
+# CONFIG_HAMRADIO is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_HARDLOCKUP_DETECTOR is not set
 # CONFIG_HAVE_AOUT is not set
@@ -1162,6 +1164,7 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_AMD756 is not set
 # CONFIG_I2C_AMD8111 is not set
 # CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_AU1550 is not set
 # CONFIG_I2C_CBUS_GPIO is not set
 # CONFIG_I2C_CHARDEV is not set
 # CONFIG_I2C_COMPAT is not set
@@ -1189,6 +1192,7 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_NOMADIK is not set
 # CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_OCTEON is not set
 # CONFIG_I2C_PARPORT is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_PCA_ISA is not set
@@ -1969,6 +1973,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
@@ -2266,7 +2272,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
@@ -2426,6 +2431,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PATA_NINJA32 is not set
 # CONFIG_PATA_NS87410 is not set
 # CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OCTEON_CF is not set
 # CONFIG_PATA_OF_PLATFORM is not set
 # CONFIG_PATA_OLDPIIX is not set
 # CONFIG_PATA_OPTI is not set
@@ -2886,9 +2892,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
@@ -3301,6 +3305,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPI_MPC52xx is not set
 # CONFIG_SPI_MPC52xx_PSC is not set
 # CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_OCTEON is not set
 # CONFIG_SPI_ORION is not set
 # CONFIG_SPI_PL022 is not set
 # CONFIG_SPI_PPC4xx is not set
@@ -3985,6 +3990,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