summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/files/crypto/ocf/criov.c
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2011-07-24 14:17:58 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2011-07-24 14:17:58 +0000
commit00dd85d8f61db55d6e08d224ed30f077075e9766 (patch)
tree7cabb1d9085c88122c18b953a731e548953a544b /target/linux/generic/files/crypto/ocf/criov.c
parent8ecad9c51ad06d4eaa325e5a9f4c42adb4b4eecb (diff)
downloadmaster-31e0f0ae-00dd85d8f61db55d6e08d224ed30f077075e9766.tar.gz
master-31e0f0ae-00dd85d8f61db55d6e08d224ed30f077075e9766.tar.bz2
master-31e0f0ae-00dd85d8f61db55d6e08d224ed30f077075e9766.zip
ocf-linux: version bump to 20110720
Fixes problem with TFM allocation in cryptosoft.c Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com> Hauke: * remove ubsec_ssb package and take it from ocf-linux * use patches from ocf-linux package * refresh all patches * readd some build fixes for OpenWrt. * readd CRYPTO_MANAGER dependency SVN-Revision: 27753
Diffstat (limited to 'target/linux/generic/files/crypto/ocf/criov.c')
-rw-r--r--target/linux/generic/files/crypto/ocf/criov.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/generic/files/crypto/ocf/criov.c b/target/linux/generic/files/crypto/ocf/criov.c
index e1b159fb4e..d3d8cfd8f7 100644
--- a/target/linux/generic/files/crypto/ocf/criov.c
+++ b/target/linux/generic/files/crypto/ocf/criov.c
@@ -35,10 +35,8 @@ __FBSDID("$FreeBSD: src/sys/opencrypto/criov.c,v 1.5 2006/06/04 22:15:13 pjd Exp
*/
#include <linux/version.h>
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
-#include <generated/autoconf.h>
-#else
-#include <linux/autoconf.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
+#include <linux/config.h>
#endif
#include <linux/module.h>
#include <linux/init.h>