diff options
author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-03-19 17:40:02 +0000 |
---|---|---|
committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-03-19 17:40:02 +0000 |
commit | 0d10d61ac3f48e144e7d1d88efb445c5a763c66a (patch) | |
tree | c7140419351334313e99e3a374e6b1e9fb0cbcef | |
parent | bc39a45d02c2ae51c21908a1793bc1df55471db8 (diff) |
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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26237 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 6d7d3ad45..e1b159fb4 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 <linux/config.h> +#include <linux/version.h> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include <generated/autoconf.h> +#else +#include <linux/autoconf.h> #endif #include <linux/module.h> #include <linux/init.h> diff --git a/target/linux/generic/files/crypto/ocf/crypto.c b/target/linux/generic/files/crypto/ocf/crypto.c index 9735f0ce9..ccd5a4bfa 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 <linux/config.h> +#include <linux/version.h> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include <generated/autoconf.h> +#else +#include <linux/autoconf.h> #endif #include <linux/module.h> #include <linux/init.h> diff --git a/target/linux/generic/files/crypto/ocf/cryptocteon/cryptocteon.c b/target/linux/generic/files/crypto/ocf/cryptocteon/cryptocteon.c index 9940f59a9..fa377e5ee 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 <linux/config.h> +#include <linux/version.h> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include <generated/autoconf.h> +#else +#include <linux/autoconf.h> #endif #include <linux/module.h> #include <linux/init.h> diff --git a/target/linux/generic/files/crypto/ocf/cryptodev.c b/target/linux/generic/files/crypto/ocf/cryptodev.c index f7ce06bc1..8f0257cce 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 <linux/config.h> +#include <linux/version.h> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include <generated/autoconf.h> +#else +#include <linux/autoconf.h> #endif #include <linux/types.h> #include <linux/time.h> diff --git a/target/linux/generic/files/crypto/ocf/cryptosoft.c b/target/linux/generic/files/crypto/ocf/cryptosoft.c index 52e1570fc..ff1315df5 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 <linux/config.h> +#include <linux/version.h> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include <generated/autoconf.h> +#else +#include <linux/autoconf.h> #endif #include <linux/module.h> #include <linux/init.h> diff --git a/target/linux/generic/files/crypto/ocf/hifn/hifn7751.c b/target/linux/generic/files/crypto/ocf/hifn/hifn7751.c index e7fd5bb5a..ad704c7fa 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 <linux/config.h> +#include <linux/version.h> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include <generated/autoconf.h> +#else +#include <linux/autoconf.h> #endif #include <linux/module.h> #include <linux/init.h> diff --git a/target/linux/generic/files/crypto/ocf/hifn/hifnHIPP.c b/target/linux/generic/files/crypto/ocf/hifn/hifnHIPP.c index 802708d72..cdc23e926 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 <linux/config.h> +#include <linux/version.h> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include <generated/autoconf.h> +#else +#include <linux/autoconf.h> #endif #include <linux/module.h> #include <linux/init.h> diff --git a/target/linux/generic/files/crypto/ocf/ixp4xx/ixp4xx.c b/target/linux/generic/files/crypto/ocf/ixp4xx/ixp4xx.c index d5414a4ef..a9eabf0bd 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 <linux/config.h> +#include <linux/version.h> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include <generated/autoconf.h> +#else +#include <linux/autoconf.h> #endif #include <linux/module.h> #include <linux/init.h> 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 ccf92276c..fb51947a1 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 <linux/config.h> +#include <linux/version.h> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include <generated/autoconf.h> +#else +#include <linux/autoconf.h> #endif #include <linux/module.h> #include <linux/init.h> diff --git a/target/linux/generic/files/crypto/ocf/ocf-bench.c b/target/linux/generic/files/crypto/ocf/ocf-bench.c index d32523185..8a3c40e8d 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 <linux/config.h> +#include <linux/version.h> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include <generated/autoconf.h> +#else +#include <linux/autoconf.h> #endif #include <linux/module.h> #include <linux/init.h> diff --git a/target/linux/generic/files/crypto/ocf/ocfnull/ocfnull.c b/target/linux/generic/files/crypto/ocf/ocfnull/ocfnull.c index a6b76cdae..0c271cdc7 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 <linux/config.h> +#include <linux/version.h> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include <generated/autoconf.h> +#else +#include <linux/autoconf.h> #endif #include <linux/module.h> #include <linux/init.h> diff --git a/target/linux/generic/files/crypto/ocf/pasemi/pasemi.c b/target/linux/generic/files/crypto/ocf/pasemi/pasemi.c index c3bb9313d..e259dd390 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 <linux/config.h> +#include <linux/version.h> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include <generated/autoconf.h> +#else +#include <linux/autoconf.h> #endif #include <linux/module.h> #include <linux/init.h> diff --git a/target/linux/generic/files/crypto/ocf/random.c b/target/linux/generic/files/crypto/ocf/random.c index 38dad13d7..d004fde6c 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 <linux/config.h> +#include <linux/version.h> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include <generated/autoconf.h> +#else +#include <linux/autoconf.h> #endif #include <linux/module.h> #include <linux/init.h> diff --git a/target/linux/generic/files/crypto/ocf/rndtest.c b/target/linux/generic/files/crypto/ocf/rndtest.c index b31e1a666..78d490a08 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 <linux/config.h> +#include <linux/version.h> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include <generated/autoconf.h> +#else +#include <linux/autoconf.h> #endif #include <linux/module.h> #include <linux/list.h> diff --git a/target/linux/generic/files/crypto/ocf/safe/safe.c b/target/linux/generic/files/crypto/ocf/safe/safe.c index 7e6510176..de7743154 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 <linux/config.h> +#include <linux/version.h> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include <generated/autoconf.h> +#else +#include <linux/autoconf.h> #endif #include <linux/module.h> #include <linux/kernel.h> diff --git a/target/linux/generic/files/crypto/ocf/talitos/talitos.c b/target/linux/generic/files/crypto/ocf/talitos/talitos.c index 94046343e..322f2ea8b 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 <linux/config.h> +#include <linux/version.h> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include <generated/autoconf.h> +#else +#include <linux/autoconf.h> #endif #include <linux/module.h> #include <linux/init.h> |