From 814f7534616f98b50ccb9422e8a014252dd1b102 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 19 Mar 2011 17:40:02 +0000 Subject: [PATCH] kernel: linux/version.h was removed in kernel 2.6.19 and is now replaced by generated/autoconf.h. This fixes build with kernel 2.6.38. This was only build tested. Thank you philipp64 for reporting SVN-Revision: 26237 --- target/linux/generic/files/crypto/ocf/criov.c | 7 +++++-- target/linux/generic/files/crypto/ocf/crypto.c | 7 +++++-- .../generic/files/crypto/ocf/cryptocteon/cryptocteon.c | 7 +++++-- target/linux/generic/files/crypto/ocf/cryptodev.c | 7 +++++-- target/linux/generic/files/crypto/ocf/cryptosoft.c | 7 +++++-- target/linux/generic/files/crypto/ocf/hifn/hifn7751.c | 7 +++++-- target/linux/generic/files/crypto/ocf/hifn/hifnHIPP.c | 7 +++++-- target/linux/generic/files/crypto/ocf/ixp4xx/ixp4xx.c | 7 +++++-- .../linux/generic/files/crypto/ocf/kirkwood/cesa_ocf_drv.c | 7 +++++-- target/linux/generic/files/crypto/ocf/ocf-bench.c | 7 +++++-- target/linux/generic/files/crypto/ocf/ocfnull/ocfnull.c | 7 +++++-- target/linux/generic/files/crypto/ocf/pasemi/pasemi.c | 7 +++++-- target/linux/generic/files/crypto/ocf/random.c | 7 +++++-- target/linux/generic/files/crypto/ocf/rndtest.c | 7 +++++-- target/linux/generic/files/crypto/ocf/safe/safe.c | 7 +++++-- target/linux/generic/files/crypto/ocf/talitos/talitos.c | 7 +++++-- 16 files changed, 80 insertions(+), 32 deletions(-) diff --git a/target/linux/generic/files/crypto/ocf/criov.c b/target/linux/generic/files/crypto/ocf/criov.c index 6d7d3ad452..e1b159fb4e 100644 --- a/target/linux/generic/files/crypto/ocf/criov.c +++ b/target/linux/generic/files/crypto/ocf/criov.c @@ -34,8 +34,11 @@ __FBSDID("$FreeBSD: src/sys/opencrypto/criov.c,v 1.5 2006/06/04 22:15:13 pjd Exp $"); */ -#ifndef AUTOCONF_INCLUDED -#include +#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include #include diff --git a/target/linux/generic/files/crypto/ocf/crypto.c b/target/linux/generic/files/crypto/ocf/crypto.c index 9735f0ce93..ccd5a4bfab 100644 --- a/target/linux/generic/files/crypto/ocf/crypto.c +++ b/target/linux/generic/files/crypto/ocf/crypto.c @@ -63,8 +63,11 @@ __FBSDID("$FreeBSD: src/sys/opencrypto/crypto.c,v 1.16 2005/01/07 02:29:16 imp E */ -#ifndef AUTOCONF_INCLUDED -#include +#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include #include diff --git a/target/linux/generic/files/crypto/ocf/cryptocteon/cryptocteon.c b/target/linux/generic/files/crypto/ocf/cryptocteon/cryptocteon.c index 9940f59a9a..fa377e5eee 100644 --- a/target/linux/generic/files/crypto/ocf/cryptocteon/cryptocteon.c +++ b/target/linux/generic/files/crypto/ocf/cryptocteon/cryptocteon.c @@ -27,8 +27,11 @@ * --------------------------------------------------------------------------- */ -#ifndef AUTOCONF_INCLUDED -#include +#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include #include diff --git a/target/linux/generic/files/crypto/ocf/cryptodev.c b/target/linux/generic/files/crypto/ocf/cryptodev.c index f7ce06bc12..8f0257cce1 100644 --- a/target/linux/generic/files/crypto/ocf/cryptodev.c +++ b/target/linux/generic/files/crypto/ocf/cryptodev.c @@ -39,8 +39,11 @@ __FBSDID("$FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.34 2007/05/09 19:37:02 gnn Exp $"); */ -#ifndef AUTOCONF_INCLUDED -#include +#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include #include diff --git a/target/linux/generic/files/crypto/ocf/cryptosoft.c b/target/linux/generic/files/crypto/ocf/cryptosoft.c index 52e1570fcc..ff1315df56 100644 --- a/target/linux/generic/files/crypto/ocf/cryptosoft.c +++ b/target/linux/generic/files/crypto/ocf/cryptosoft.c @@ -34,8 +34,11 @@ * --------------------------------------------------------------------------- */ -#ifndef AUTOCONF_INCLUDED -#include +#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include #include diff --git a/target/linux/generic/files/crypto/ocf/hifn/hifn7751.c b/target/linux/generic/files/crypto/ocf/hifn/hifn7751.c index e7fd5bb5a3..ad704c7fab 100644 --- a/target/linux/generic/files/crypto/ocf/hifn/hifn7751.c +++ b/target/linux/generic/files/crypto/ocf/hifn/hifn7751.c @@ -46,8 +46,11 @@ __FBSDID("$FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.40 2007/03/21 03:42:49 sam E /* * Driver for various Hifn encryption processors. */ -#ifndef AUTOCONF_INCLUDED -#include +#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include #include diff --git a/target/linux/generic/files/crypto/ocf/hifn/hifnHIPP.c b/target/linux/generic/files/crypto/ocf/hifn/hifnHIPP.c index 802708d72c..cdc23e926f 100644 --- a/target/linux/generic/files/crypto/ocf/hifn/hifnHIPP.c +++ b/target/linux/generic/files/crypto/ocf/hifn/hifnHIPP.c @@ -32,8 +32,11 @@ /* * Driver for various Hifn encryption processors. */ -#ifndef AUTOCONF_INCLUDED -#include +#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include #include diff --git a/target/linux/generic/files/crypto/ocf/ixp4xx/ixp4xx.c b/target/linux/generic/files/crypto/ocf/ixp4xx/ixp4xx.c index d5414a4ef5..a9eabf0bdc 100644 --- a/target/linux/generic/files/crypto/ocf/ixp4xx/ixp4xx.c +++ b/target/linux/generic/files/crypto/ocf/ixp4xx/ixp4xx.c @@ -33,8 +33,11 @@ * and/or fitness for purpose. */ -#ifndef AUTOCONF_INCLUDED -#include +#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include #include diff --git a/target/linux/generic/files/crypto/ocf/kirkwood/cesa_ocf_drv.c b/target/linux/generic/files/crypto/ocf/kirkwood/cesa_ocf_drv.c index ccf92276c0..fb51947a1a 100644 --- a/target/linux/generic/files/crypto/ocf/kirkwood/cesa_ocf_drv.c +++ b/target/linux/generic/files/crypto/ocf/kirkwood/cesa_ocf_drv.c @@ -26,8 +26,11 @@ DISCLAIMED. The GPL License provides additional details about this warranty disclaimer. *******************************************************************************/ -#ifndef AUTOCONF_INCLUDED -#include +#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include #include diff --git a/target/linux/generic/files/crypto/ocf/ocf-bench.c b/target/linux/generic/files/crypto/ocf/ocf-bench.c index d32523185f..8a3c40e8d0 100644 --- a/target/linux/generic/files/crypto/ocf/ocf-bench.c +++ b/target/linux/generic/files/crypto/ocf/ocf-bench.c @@ -30,8 +30,11 @@ */ -#ifndef AUTOCONF_INCLUDED -#include +#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include #include diff --git a/target/linux/generic/files/crypto/ocf/ocfnull/ocfnull.c b/target/linux/generic/files/crypto/ocf/ocfnull/ocfnull.c index a6b76cdaef..0c271cdc74 100644 --- a/target/linux/generic/files/crypto/ocf/ocfnull/ocfnull.c +++ b/target/linux/generic/files/crypto/ocf/ocfnull/ocfnull.c @@ -33,8 +33,11 @@ * and/or fitness for purpose. */ -#ifndef AUTOCONF_INCLUDED -#include +#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include #include diff --git a/target/linux/generic/files/crypto/ocf/pasemi/pasemi.c b/target/linux/generic/files/crypto/ocf/pasemi/pasemi.c index c3bb9313d3..e259dd390a 100644 --- a/target/linux/generic/files/crypto/ocf/pasemi/pasemi.c +++ b/target/linux/generic/files/crypto/ocf/pasemi/pasemi.c @@ -17,8 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef AUTOCONF_INCLUDED -#include +#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include #include diff --git a/target/linux/generic/files/crypto/ocf/random.c b/target/linux/generic/files/crypto/ocf/random.c index 38dad13d77..d004fde6c7 100644 --- a/target/linux/generic/files/crypto/ocf/random.c +++ b/target/linux/generic/files/crypto/ocf/random.c @@ -35,8 +35,11 @@ * and/or fitness for purpose. */ -#ifndef AUTOCONF_INCLUDED -#include +#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include #include diff --git a/target/linux/generic/files/crypto/ocf/rndtest.c b/target/linux/generic/files/crypto/ocf/rndtest.c index b31e1a666d..78d490a080 100644 --- a/target/linux/generic/files/crypto/ocf/rndtest.c +++ b/target/linux/generic/files/crypto/ocf/rndtest.c @@ -36,8 +36,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AUTOCONF_INCLUDED -#include +#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include #include diff --git a/target/linux/generic/files/crypto/ocf/safe/safe.c b/target/linux/generic/files/crypto/ocf/safe/safe.c index 7e65101769..de7743154f 100644 --- a/target/linux/generic/files/crypto/ocf/safe/safe.c +++ b/target/linux/generic/files/crypto/ocf/safe/safe.c @@ -31,8 +31,11 @@ __FBSDID("$FreeBSD: src/sys/dev/safe/safe.c,v 1.18 2007/03/21 03:42:50 sam Exp $"); */ -#ifndef AUTOCONF_INCLUDED -#include +#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include #include diff --git a/target/linux/generic/files/crypto/ocf/talitos/talitos.c b/target/linux/generic/files/crypto/ocf/talitos/talitos.c index 94046343ef..322f2ea8b7 100644 --- a/target/linux/generic/files/crypto/ocf/talitos/talitos.c +++ b/target/linux/generic/files/crypto/ocf/talitos/talitos.c @@ -107,8 +107,11 @@ * o add statistics */ -#ifndef AUTOCONF_INCLUDED -#include +#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include #include -- 2.30.2