[realview] update to kernel 3.0

[openwrt.git] / target / linux / generic / files / crypto / ocf / cryptodev.c

diff --git a/target/linux/generic/files/crypto/ocf/cryptodev.c b/target/linux/generic/files/crypto/ocf/cryptodev.c
index f7ce06b..2ee3618 100644 (file)
--- a/target/linux/generic/files/crypto/ocf/cryptodev.c
+++ b/target/linux/generic/files/crypto/ocf/cryptodev.c
@@ -39,7 +39,8 @@
 __FBSDID("$FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.34 2007/05/09 19:37:02 gnn Exp $");
  */
 
 __FBSDID("$FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.34 2007/05/09 19:37:02 gnn Exp $");
  */
 

-#ifndef AUTOCONF_INCLUDED
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)

 #include <linux/config.h>
 #endif
 #include <linux/types.h>
 #include <linux/config.h>
 #endif
 #include <linux/types.h>


@@ -57,7 +58,6 @@ __FBSDID("$FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.34 2007/05/09 19:37:02 gn
 #include <linux/file.h>
 #include <linux/mount.h>
 #include <linux/miscdevice.h>
 #include <linux/file.h>
 #include <linux/mount.h>
 #include <linux/miscdevice.h>

-#include <linux/version.h>

 #include <asm/uaccess.h>
 
 #include <cryptodev.h>
 #include <asm/uaccess.h>
 
 #include <cryptodev.h>