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.blumensti...@googlemail.com> --- package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.h | 2 +- package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.h | 2 +- package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h | 2 +- package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.h | 2 +- package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c | 2 +- package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c | 2 +- 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 1d84da3..6941455 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 62ad96d..25efa04 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 5198a4a..fde7a90 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 d2cfd11..fcbda40 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 a5f5f90..2492549 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 a5a6c39..a447c15 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> -- 2.7.0 _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
