aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.3/940-ocf_kbuild_integration.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-03-03 14:10:27 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-03-03 14:10:27 +0000
commitd8d782c5d7f51f022b10ee560b6c105492344b8f (patch)
treef552ce467af8ae2466f8f6378fbdac232b2ffc75 /target/linux/generic/patches-3.3/940-ocf_kbuild_integration.patch
parent0d81aed761563a503c03ec1e5cd85f7ef751c51a (diff)
downloadmaster-187ad058-d8d782c5d7f51f022b10ee560b6c105492344b8f.tar.gz
master-187ad058-d8d782c5d7f51f022b10ee560b6c105492344b8f.tar.bz2
master-187ad058-d8d782c5d7f51f022b10ee560b6c105492344b8f.zip
linux/3.3: merge recent ubifs patches from 3.2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30800 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.3/940-ocf_kbuild_integration.patch')
-rw-r--r--target/linux/generic/patches-3.3/940-ocf_kbuild_integration.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.3/940-ocf_kbuild_integration.patch b/target/linux/generic/patches-3.3/940-ocf_kbuild_integration.patch
index 55a2bed030..b5cce90a1b 100644
--- a/target/linux/generic/patches-3.3/940-ocf_kbuild_integration.patch
+++ b/target/linux/generic/patches-3.3/940-ocf_kbuild_integration.patch
@@ -1,6 +1,6 @@
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
-@@ -961,3 +961,6 @@ config CRYPTO_USER_API_SKCIPHER
+@@ -968,3 +968,6 @@ config CRYPTO_USER_API_SKCIPHER
source "drivers/crypto/Kconfig"
endif # if CRYPTO
@@ -9,7 +9,7 @@
+
--- a/crypto/Makefile
+++ b/crypto/Makefile
-@@ -91,6 +91,8 @@ obj-$(CONFIG_CRYPTO_USER_API) += af_alg.
+@@ -92,6 +92,8 @@ obj-$(CONFIG_CRYPTO_USER_API) += af_alg.
obj-$(CONFIG_CRYPTO_USER_API_HASH) += algif_hash.o
obj-$(CONFIG_CRYPTO_USER_API_SKCIPHER) += algif_skcipher.o