linux/3.3: merge recent ubifs patches from 3.2

[oweals/openwrt.git] / target / linux / generic / config-3.3

diff --git a/target/linux/generic/config-3.3 b/target/linux/generic/config-3.3
index 216518416a79a11918f520558ed8c62edc5012d5..967b89803a914a27479f480cc5e763423bc1a2e0 100644 (file)
--- a/target/linux/generic/config-3.3
+++ b/target/linux/generic/config-3.3
@@ -491,6 +491,7 @@ CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 # CONFIG_CRYPTO_VMAC is not set
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_XZ is not set
 # CONFIG_CRYPTO_XTS is not set
 # CONFIG_CRYPTO_ZLIB is not set
 # CONFIG_CRYSTALHD is not set
@@ -1360,6 +1361,7 @@ CONFIG_LZMA_DECOMPRESS=y
 # CONFIG_MFD_CORE is not set
 # CONFIG_MFD_CS5535 is not set
 # CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9052_I2C is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_MAX8925 is not set
 # CONFIG_MFD_MAX8997 is not set
@@ -1368,6 +1370,7 @@ CONFIG_LZMA_DECOMPRESS=y
 # CONFIG_MFD_MC13XXX is not set
 # CONFIG_MFD_PCF50633 is not set
 # CONFIG_MFD_RDC321X is not set
+# CONFIG_MFD_S5M_CORE is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_STMPE is not set
 CONFIG_MFD_SUPPORT=y
@@ -1574,6 +1577,7 @@ CONFIG_NETDEV_1000=y
 # CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
 # CONFIG_NETFILTER_XT_MATCH_DCCP is not set
 # CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ECN is not set
 # CONFIG_NETFILTER_XT_MATCH_ESP is not set
 # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
 # CONFIG_NETFILTER_XT_MATCH_HELPER is not set
@@ -2853,6 +2857,7 @@ CONFIG_USB_EZUSB=y
 # CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_GADGET_DEBUG is not set
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_GL860 is not set
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_GSPCA is not set
@@ -2899,6 +2904,7 @@ CONFIG_USB_EZUSB=y
 # CONFIG_USB_GSPCA_VICAM is not set
 # CONFIG_USB_GSPCA_XIRLINK_CIT is not set
 # CONFIG_USB_GSPCA_ZC3XX is not set
+# CONFIG_USB_G_ACM_MS is not set
 # CONFIG_USB_G_MULTI is not set
 # CONFIG_USB_G_NOKIA is not set
 # CONFIG_USB_HID is not set
@@ -2964,6 +2970,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_PRINTER is not set
 # CONFIG_USB_PWC_INPUT_EVDEV is not set
 # CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_RENESAS_USBHS is not set
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_S2255 is not set