summaryrefslogtreecommitdiff
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
commitda628121b079927c72191f6066dfa3fb70bd4163 (patch)
tree8c44a42ca520b9ca4541cbe0dca366e1dedff063 /target/linux/generic/patches-3.3/940-ocf_kbuild_integration.patch
parent419d9e2f54b51ff65399cf357ff3a2ddb8dafe52 (diff)
downloadmtk-20170518-da628121b079927c72191f6066dfa3fb70bd4163.zip
mtk-20170518-da628121b079927c72191f6066dfa3fb70bd4163.tar.gz
mtk-20170518-da628121b079927c72191f6066dfa3fb70bd4163.tar.bz2
linux/3.3: merge recent ubifs patches from 3.2
SVN-Revision: 30800
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 55a2bed..b5cce90 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