X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fconfig-3.12;h=3ff458610b76c8e656cf304a8a7e26c462593c1a;hb=2108ca0d9a03d66dd5979fd6a757c1fa23b6ea02;hp=8398a6130a7e3fb751264c0da773285349b6244a;hpb=2d28a07df741b6e726f01277fe3bdbfe1352ed57;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/generic/config-3.12 b/target/linux/generic/config-3.12
index 8398a6130a..3ff458610b 100644
--- a/target/linux/generic/config-3.12
+++ b/target/linux/generic/config-3.12
@@ -553,6 +553,7 @@ CONFIG_CAVIUM_OCTEON_HELPER=y
 # CONFIG_CIFS 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_SMB2 is not set
@@ -639,6 +640,9 @@ CONFIG_CRYPTO_ALGAPI2=y
 # CONFIG_CRYPTO_CTS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
 # CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_DEV_ATMEL_AES is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA is not set
+# CONFIG_CRYPTO_DEV_ATMEL_TDES is not set
 # CONFIG_CRYPTO_DEV_FSL_CAAM is not set
 # CONFIG_CRYPTO_DEV_HIFN_795X is not set
 # CONFIG_CRYPTO_DEV_MV_CESA is not set
@@ -1591,6 +1595,7 @@ CONFIG_KERNEL_XZ=y
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_OMAP4 is not set
 # CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_PXA27x is not set
 # CONFIG_KEYBOARD_QT1070 is not set
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_SAMSUNG is not set
@@ -1628,6 +1633,7 @@ CONFIG_LBDAF=y
 # CONFIG_LCD_ILI9320 is not set
 # CONFIG_LCD_LMS501KF03 is not set
 # CONFIG_LDM_PARTITION is not set
+# CONFIG_LEDS_ATMEL_PWM is not set
 # CONFIG_LEDS_BD2802 is not set
 # CONFIG_LEDS_BLINKM is not set
 CONFIG_LEDS_CLASS=y
@@ -1794,6 +1800,7 @@ CONFIG_LZMA_DECOMPRESS=y
 # CONFIG_MFD_MC13XXX is not set
 # CONFIG_MFD_MC13XXX_I2C is not set
 # CONFIG_MFD_MC13XXX_SPI is not set
+# CONFIG_MFD_OMAP_USB_HOST is not set
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_MFD_PCF50633 is not set
 # CONFIG_MFD_RC5T583 is not set
@@ -2031,6 +2038,7 @@ CONFIG_MTD_ROOTFS_SPLIT=y
 CONFIG_MTD_SPLIT=y
 # CONFIG_MTD_SPLIT_FIRMWARE is not set
 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_UIMAGE_FW is not set
@@ -2294,6 +2302,7 @@ CONFIG_NFSD_V3=y
 # CONFIG_NFS_ACL_SUPPORT is not set
 CONFIG_NFS_COMMON=y
 # CONFIG_NFS_FS is not set
+# CONFIG_NFS_FSCACHE is not set
 # CONFIG_NFS_SWAP is not set
 # CONFIG_NFS_V2 is not set
 CONFIG_NFS_V3=y
@@ -3632,6 +3641,7 @@ CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_DWC_OTG_LPM is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_EG20T is not set
+# CONFIG_USB_EHCI_HCD_AT91 is not set
 # CONFIG_USB_EHCI_HCD_PPC_OF is not set
 # CONFIG_USB_EHCI_MV is not set
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
@@ -3862,7 +3872,6 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
 # CONFIG_USB_SERIAL_SAFE is not set
 CONFIG_USB_SERIAL_SAFE_PADDED=y
 # CONFIG_USB_SERIAL_SIEMENS_MPI is not set
-# CONFIG_USB_SERIAL_SIMPLE is not set
 # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
 # CONFIG_USB_SERIAL_SIMPLE is not set
 # CONFIG_USB_SERIAL_SPCP8X5 is not set
@@ -4080,6 +4089,7 @@ CONFIG_VMSPLIT_3G=y
 # CONFIG_W1_SLAVE_DS28E04 is not set
 # CONFIG_W1_SLAVE_SMEM is not set
 # CONFIG_W1_SLAVE_THERM is not set
+# CONFIG_W35UND is not set
 # CONFIG_W83627HF_WDT is not set
 # CONFIG_W83697HF_WDT is not set
 # CONFIG_W83877F_WDT is not set