diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2011-07-24 14:17:58 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2011-07-24 14:17:58 +0000 |
commit | 56d7544ebb722827e046818a7a030caaec1e7ed6 (patch) | |
tree | d7b0162875a7ae451eed4ae42321f3f4d912c788 /target/linux/generic/files/crypto/ocf/ocfnull/ocfnull.c | |
parent | 172c2218549787eaf3afdbd6f12b7e27bd4169df (diff) | |
download | master-187ad058-56d7544ebb722827e046818a7a030caaec1e7ed6.tar.gz master-187ad058-56d7544ebb722827e046818a7a030caaec1e7ed6.tar.bz2 master-187ad058-56d7544ebb722827e046818a7a030caaec1e7ed6.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
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/ocfnull.c')
-rw-r--r-- | target/linux/generic/files/crypto/ocf/ocfnull/ocfnull.c | 6 |
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 0c271cdc74..9cf3f6e029 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> |