kernel: refresh patches with 2.6.34-rc4

[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.34 / 970-ocf_kbuild_integration.patch

diff --git a/target/linux/generic-2.6/patches-2.6.34/970-ocf_kbuild_integration.patch b/target/linux/generic-2.6/patches-2.6.34/970-ocf_kbuild_integration.patch
index 0c40bdc9260497fdda6daf94bd5910b511ab238f..3a285deba4a5445594a920e939f11ded4bb1daa4 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.34/970-ocf_kbuild_integration.patch
+++ b/target/linux/generic-2.6/patches-2.6.34/970-ocf_kbuild_integration.patch
@@ -1,8 +1,8 @@
 --- a/crypto/Kconfig
 +++ b/crypto/Kconfig
-@@ -823,6 +823,8 @@ config CRYPTO_ANSI_CPRNG
-         ANSI X9.31 A.2.4. Not this option must be enabled if CRYPTO_FIPS 
-         is selected
+@@ -833,6 +833,8 @@ config CRYPTO_ANSI_CPRNG
+         ANSI X9.31 A.2.4. Note that this option must be enabled if
+         CRYPTO_FIPS is selected
  
 +source "crypto/ocf/Kconfig"
 +
@@ -11,7 +11,7 @@
  endif # if CRYPTO
 --- a/crypto/Makefile
 +++ b/crypto/Makefile
-@@ -86,6 +86,11 @@ obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
+@@ -87,6 +87,11 @@ obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
  obj-$(CONFIG_CRYPTO_GHASH) += ghash-generic.o
  
  #