aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.34/970-ocf_kbuild_integration.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2010-04-18 18:35:47 +0000
committerHauke Mehrtens <hauke@openwrt.org>2010-04-18 18:35:47 +0000
commitbef7d3cd16f55a817b810454500ca06ab8eb57b2 (patch)
treec752890e176316502ae064e00342c64d54ffc8c8 /target/linux/generic-2.6/patches-2.6.34/970-ocf_kbuild_integration.patch
parent7905b3032af87a2cf2d7907af16a455d33a80887 (diff)
downloadmaster-187ad058-bef7d3cd16f55a817b810454500ca06ab8eb57b2.tar.gz
master-187ad058-bef7d3cd16f55a817b810454500ca06ab8eb57b2.tar.bz2
master-187ad058-bef7d3cd16f55a817b810454500ca06ab8eb57b2.zip
kernel: refresh patches with 2.6.34-rc4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20999 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.patch8
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
#