Author: nbd Date: 2016-01-17 20:23:14 +0100 (Sun, 17 Jan 2016) New Revision: 48282
Modified: trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.h trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.h trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.h trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c Log: 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 <[email protected]> Modified: trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.h =================================================================== --- trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.h 2016-01-17 18:24:30 UTC (rev 48281) +++ trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.h 2016-01-17 19:23:14 UTC (rev 48282) @@ -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" Modified: trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.h =================================================================== --- trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.h 2016-01-17 18:24:30 UTC (rev 48281) +++ trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.h 2016-01-17 19:23:14 UTC (rev 48282) @@ -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" Modified: trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h =================================================================== --- trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h 2016-01-17 18:24:30 UTC (rev 48281) +++ trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h 2016-01-17 19:23:14 UTC (rev 48282) @@ -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> Modified: trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.h =================================================================== --- trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.h 2016-01-17 18:24:30 UTC (rev 48281) +++ trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.h 2016-01-17 19:23:14 UTC (rev 48282) @@ -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" Modified: trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c =================================================================== --- trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c 2016-01-17 18:24:30 UTC (rev 48281) +++ trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c 2016-01-17 19:23:14 UTC (rev 48282) @@ -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) Modified: trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c =================================================================== --- trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c 2016-01-17 18:24:30 UTC (rev 48281) +++ trunk/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c 2016-01-17 19:23:14 UTC (rev 48282) @@ -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> _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
