summaryrefslogtreecommitdiff
path: root/target/linux/generic-2.6/patches-2.6.31/970-ocf_kbuild_integration.patch
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-05-04 20:59:19 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-05-04 20:59:19 +0000
commit40b344028b6b043b73512f036be7b3e963f85c88 (patch)
treee2514d65fed366af6c5f498e58431b2008ccf437 /target/linux/generic-2.6/patches-2.6.31/970-ocf_kbuild_integration.patch
parent64f1ed8de7026752f2b306797226b932e386b4b5 (diff)
[generic-2.6] update OCF framework to version 20100325
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21356 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.31/970-ocf_kbuild_integration.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.31/970-ocf_kbuild_integration.patch19
1 files changed, 7 insertions, 12 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.31/970-ocf_kbuild_integration.patch b/target/linux/generic-2.6/patches-2.6.31/970-ocf_kbuild_integration.patch
index a6d86ce44a..61897eb4a6 100644
--- a/target/linux/generic-2.6/patches-2.6.31/970-ocf_kbuild_integration.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/970-ocf_kbuild_integration.patch
@@ -1,25 +1,20 @@
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
-@@ -788,6 +788,8 @@ config CRYPTO_ANSI_CPRNG
- for cryptographic modules. Uses the Algorithm specified in
- ANSI X9.31 A.2.4
-
-+source "crypto/ocf/Kconfig"
-+
+@@ -791,3 +791,6 @@ config CRYPTO_ANSI_CPRNG
source "drivers/crypto/Kconfig"
endif # if CRYPTO
++
++source "crypto/ocf/Kconfig"
++
--- a/crypto/Makefile
+++ b/crypto/Makefile
-@@ -85,6 +85,11 @@ obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_
+@@ -84,6 +84,8 @@ obj-$(CONFIG_CRYPTO_RNG2) += krng.o
+ obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_cprng.o
obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
- #
-+# OCF
-+#
+obj-$(CONFIG_OCF_OCF) += ocf/
+
-+#
+ #
# generic algorithms and the async_tx api
#
- obj-$(CONFIG_XOR_BLOCKS) += xor.o