Changeset 30800


Ignore:
Timestamp:
2012-03-03T15:10:27+01:00 (6 years ago)
Author:
juhosg
Message:

linux/3.3: merge recent ubifs patches from 3.2

Location:
trunk/target/linux/generic
Files:
3 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/config-3.3

    r30737 r30800  
    492492# CONFIG_CRYPTO_WP512 is not set 
    493493# CONFIG_CRYPTO_XCBC is not set 
     494# CONFIG_CRYPTO_XZ is not set 
    494495# CONFIG_CRYPTO_XTS is not set 
    495496# CONFIG_CRYPTO_ZLIB is not set 
  • trunk/target/linux/generic/patches-3.3/940-ocf_kbuild_integration.patch

    r29986 r30800  
    11--- a/crypto/Kconfig 
    22+++ b/crypto/Kconfig 
    3 @@ -961,3 +961,6 @@ config CRYPTO_USER_API_SKCIPHER 
     3@@ -968,3 +968,6 @@ config CRYPTO_USER_API_SKCIPHER 
    44 source "drivers/crypto/Kconfig" 
    55  
     
    1010--- a/crypto/Makefile 
    1111+++ b/crypto/Makefile 
    12 @@ -91,6 +91,8 @@ obj-$(CONFIG_CRYPTO_USER_API) += af_alg. 
     12@@ -92,6 +92,8 @@ obj-$(CONFIG_CRYPTO_USER_API) += af_alg. 
    1313 obj-$(CONFIG_CRYPTO_USER_API_HASH) += algif_hash.o 
    1414 obj-$(CONFIG_CRYPTO_USER_API_SKCIPHER) += algif_skcipher.o 
Note: See TracChangeset for help on using the changeset viewer.