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 7c9eddf3d808910a6f3c66859dfeef367da099f8..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
@@ -1265,6 +1266,7 @@ CONFIG_LBDAF=y
 # CONFIG_LEDS_BD2802 is not set
 CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_DAC124S085 is not set
+CONFIG_LEDS_GPIO_PLATFORM=y
 # CONFIG_LEDS_INTEL_SS4200 is not set
 # CONFIG_LEDS_LM3530 is not set
 # CONFIG_LEDS_LP3944 is not set