aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/lantiq
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-17 19:23:14 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-17 19:23:14 +0000
commit5d59da0548d89c2c4c32f0cc5cd5657072643f95 (patch)
tree592ed1c5f4f7f925e64baccc9223afc28899929e /package/kernel/lantiq
parent0219006854d18cc0ab6146468897e165d500411b (diff)
downloadmaster-187ad058-5d59da0548d89c2c4c32f0cc5cd5657072643f95.tar.gz
master-187ad058-5d59da0548d89c2c4c32f0cc5cd5657072643f95.tar.bz2
master-187ad058-5d59da0548d89c2c4c32f0cc5cd5657072643f95.zip
lantiq: ltq-deu: Make the DEU driver compatible with linux 4.2 and newer
Upstream linux 4.2 commit 84be456f883c4685680fba8e5154b5f72e92957e "remove <asm/scatterlist.h>" requires us to include linux/scatterlist.h instead. This also works with older kernels (at least 4.1, thanks to Hauke Mehrtens for testing). Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48282 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/lantiq')
-rw-r--r--package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.h2
-rw-r--r--package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.h2
-rw-r--r--package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h2
-rw-r--r--package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.h2
-rw-r--r--package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c2
-rw-r--r--package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.h b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.h
index 1d84da3a5a..69414553de 100644
--- a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.h
+++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.h
@@ -54,7 +54,7 @@
#include <crypto/algapi.h>
#include <linux/module.h>
#include <linux/mm.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
#include <linux/skbuff.h>
#include <linux/netdevice.h>
#include "ifxmips_deu.h"
diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.h b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.h
index 62ad96d987..25efa04a69 100644
--- a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.h
+++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.h
@@ -53,7 +53,7 @@
#include <crypto/algapi.h>
#include <linux/module.h>
#include <linux/mm.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
#include <linux/skbuff.h>
#include <linux/netdevice.h>
#include "ifxmips_deu.h"
diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h
index 5198a4a11f..fde7a900bb 100644
--- a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h
+++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h
@@ -35,7 +35,7 @@
#include <linux/module.h>
#include <linux/mm.h>
#include <linux/crypto.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
#include <asm/byteorder.h>
#include <linux/skbuff.h>
#include <linux/netdevice.h>
diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.h b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.h
index d2cfd11702..fcbda40159 100644
--- a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.h
+++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.h
@@ -54,7 +54,7 @@
#include <crypto/algapi.h>
#include <linux/module.h>
#include <linux/mm.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
#include <linux/skbuff.h>
#include <linux/netdevice.h>
#include "ifxmips_deu.h"
diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c
index a5f5f90a79..24925494bf 100644
--- a/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c
+++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c
@@ -48,7 +48,7 @@
#include <crypto/sha.h>
#include <crypto/internal/hash.h>
#include <linux/types.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
#include <asm/byteorder.h>
#if defined(CONFIG_DANUBE)
diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c
index a5a6c39154..a447c15fe8 100644
--- a/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c
+++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c
@@ -47,7 +47,7 @@
#include <linux/cryptohash.h>
#include <crypto/internal/hash.h>
#include <linux/types.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
#include <asm/byteorder.h>
#include <linux/delay.h>