diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-05-04 20:59:19 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-05-04 20:59:19 +0000 |
| commit | 40b344028b6b043b73512f036be7b3e963f85c88 (patch) | |
| tree | e2514d65fed366af6c5f498e58431b2008ccf437 /target/linux/generic-2.6/patches-2.6.34/970-ocf_kbuild_integration.patch | |
| parent | 64f1ed8de7026752f2b306797226b932e386b4b5 (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.34/970-ocf_kbuild_integration.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.34/970-ocf_kbuild_integration.patch | 19 |
1 files changed, 7 insertions, 12 deletions
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 3a285deba..76413e9ce 100644 --- 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,25 +1,20 @@ --- a/crypto/Kconfig +++ b/crypto/Kconfig -@@ -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" -+ +@@ -836,3 +836,6 @@ config CRYPTO_ANSI_CPRNG source "drivers/crypto/Kconfig" endif # if CRYPTO ++ ++source "crypto/ocf/Kconfig" ++ --- a/crypto/Makefile +++ b/crypto/Makefile -@@ -87,6 +87,11 @@ obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o +@@ -86,6 +86,8 @@ obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_ + obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o obj-$(CONFIG_CRYPTO_GHASH) += ghash-generic.o - # -+# OCF -+# +obj-$(CONFIG_OCF_OCF) += ocf/ + -+# + # # generic algorithms and the async_tx api # - obj-$(CONFIG_XOR_BLOCKS) += xor.o |