X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fconfig-3.12;h=7aca57addc4ae89c46a6b48a6dcef31942bccd41;hb=0e655122c64b3c3885df8e03741a4e1bdc568623;hp=2d43e6d12d51a88378d0ad40c7b306b0421acd6c;hpb=531d2b7aae43128c7abfef0194d6e17ce22c1b08;p=lede-git%2F.git

diff --git a/target/linux/generic/config-3.12 b/target/linux/generic/config-3.12
index 2d43e6d12d..7aca57addc 100644
--- a/target/linux/generic/config-3.12
+++ b/target/linux/generic/config-3.12
@@ -1412,6 +1412,7 @@ CONFIG_IOSCHED_NOOP=y
 # CONFIG_IP6_NF_TARGET_HL is not set
 # CONFIG_IP6_NF_TARGET_LOG is not set
 # CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_TARGET_SYNPROXY is not set
 # CONFIG_IPACK_BUS is not set
 CONFIG_IP_ADVANCED_ROUTER=y
 # CONFIG_IPC_NS is not set
@@ -1442,6 +1443,7 @@ CONFIG_IP_MULTIPLE_TABLES=y
 # CONFIG_IP_NF_TARGET_NETMAP is not set
 # CONFIG_IP_NF_TARGET_REDIRECT is not set
 # CONFIG_IP_NF_TARGET_REJECT is not set
+# CONFIG_IP_NF_TARGET_SYNPROXY is not set
 # CONFIG_IP_NF_TARGET_TTL is not set
 # CONFIG_IP_NF_TARGET_ULOG is not set
 # CONFIG_IP_PIMSM_V1 is not set
@@ -1854,6 +1856,9 @@ CONFIG_MMC_BLOCK_MINORS=8
 # CONFIG_MMC_MVSDIO is not set
 # CONFIG_MMC_S3C is not set
 # CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_SDHCI_ACPI is not set
+# CONFIG_MMC_SDHCI_OF_ESDHC is not set
+# CONFIG_MMC_SDHCI_OF_HLWD is not set
 # CONFIG_MMC_SDHCI_PXAV2 is not set
 # CONFIG_MMC_SDHCI_PXAV3 is not set
 # CONFIG_MMC_SDRICOH_CS is not set
@@ -1931,6 +1936,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_MYLOADER_PARTS is not set
 # CONFIG_MTD_NAND_AMS_DELTA is not set
 # CONFIG_MTD_NAND_AR934X is not set
+# CONFIG_MTD_NAND_AR934X_HW_ECC is not set
 # CONFIG_MTD_NAND_ATMEL is not set
 # CONFIG_MTD_NAND_AU1550 is not set
 # CONFIG_MTD_NAND_AUTCPU12 is not set
@@ -3609,6 +3615,7 @@ CONFIG_USB_EZUSB=y
 # CONFIG_USB_FILE_STORAGE is not set
 # CONFIG_USB_FOTG210_HCD is not set
 # CONFIG_USB_FOTG210_UDC is not set
+# CONFIG_USB_FSL_USB2 is not set
 # CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_FUNCTIONFS is not set
 # CONFIG_USB_FUSB300 is not set