diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-04-18 18:35:47 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-04-18 18:35:47 +0000 |
| commit | 78981f6f3c3fa003b7c9c351a1c902027fa1d1cd (patch) | |
| tree | 3d48afe764021b9292fe61bfc90efc9e44d67298 /target/linux/generic-2.6/patches-2.6.34/970-ocf_kbuild_integration.patch | |
| parent | 8c0ee9484b18f1db5fb901829706626bf5fc5a26 (diff) | |
| download | upstream-78981f6f3c3fa003b7c9c351a1c902027fa1d1cd.tar.gz upstream-78981f6f3c3fa003b7c9c351a1c902027fa1d1cd.tar.bz2 upstream-78981f6f3c3fa003b7c9c351a1c902027fa1d1cd.zip | |
kernel: refresh patches with 2.6.34-rc4
SVN-Revision: 20999
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 | 8 |
1 files changed, 4 insertions, 4 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 0c40bdc926..3a285deba4 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,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 # |