aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.0/940-ocf_kbuild_integration.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2011-06-15 21:31:01 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2011-06-15 21:31:01 +0000
commit235e3319876d5d1354e2774ec73495fdeb2616ec (patch)
treed776ac5daed14d9e6ee5562e979d388420e8ff08 /target/linux/generic/patches-3.0/940-ocf_kbuild_integration.patch
parent0db9c2bd7d3620ba18fa784bda702d971783b4f6 (diff)
downloadupstream-235e3319876d5d1354e2774ec73495fdeb2616ec.tar.gz
upstream-235e3319876d5d1354e2774ec73495fdeb2616ec.tar.bz2
upstream-235e3319876d5d1354e2774ec73495fdeb2616ec.zip
linux/generic: Add support for 3.0-rc3
Also make linux identify itself properly as 3.0, not 3.0.0. Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com> SVN-Revision: 27191
Diffstat (limited to 'target/linux/generic/patches-3.0/940-ocf_kbuild_integration.patch')
-rw-r--r--target/linux/generic/patches-3.0/940-ocf_kbuild_integration.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.0/940-ocf_kbuild_integration.patch b/target/linux/generic/patches-3.0/940-ocf_kbuild_integration.patch
new file mode 100644
index 0000000000..8fa136befe
--- /dev/null
+++ b/target/linux/generic/patches-3.0/940-ocf_kbuild_integration.patch
@@ -0,0 +1,20 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -860,3 +860,6 @@ config CRYPTO_USER_API_SKCIPHER
+ source "drivers/crypto/Kconfig"
+
+ endif # if CRYPTO
++
++source "crypto/ocf/Kconfig"
++
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -89,6 +89,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
+
++obj-$(CONFIG_OCF_OCF) += ocf/
++
+ #
+ # generic algorithms and the async_tx api
+ #