summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/files/crypto/ocf/ocfnull
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-24 14:17:58 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-24 14:17:58 +0000
commit32dec7075aae5cc6ef1e4394dc94fed1767b848e (patch)
treed7b0162875a7ae451eed4ae42321f3f4d912c788 /target/linux/generic/files/crypto/ocf/ocfnull
parentc3cc5459ecb9da60a4f90550d9031d7a67478f7a (diff)
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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27753 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/files/crypto/ocf/ocfnull')
-rw-r--r--target/linux/generic/files/crypto/ocf/ocfnull/ocfnull.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/generic/files/crypto/ocf/ocfnull/ocfnull.c b/target/linux/generic/files/crypto/ocf/ocfnull/ocfnull.c
index 0c271cdc7..9cf3f6e02 100644
--- a/target/linux/generic/files/crypto/ocf/ocfnull/ocfnull.c
+++ b/target/linux/generic/files/crypto/ocf/ocfnull/ocfnull.c
@@ -34,10 +34,8 @@
*/
#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>