aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorMartin Blumenstingl <martin.blumenstingl@googlemail.com>2022-03-21 20:05:27 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2022-10-22 19:44:45 +0200
commitd6e506eaaaef857c440e120bb6bea97773ce48c2 (patch)
tree2759617956380ff2c9e2534a8e3ad80e22722b1f /package
parente4c76e6fa34b52bdbe3e7601a4ef43525fc0999b (diff)
downloadupstream-d6e506eaaaef857c440e120bb6bea97773ce48c2.tar.gz
upstream-d6e506eaaaef857c440e120bb6bea97773ce48c2.tar.bz2
upstream-d6e506eaaaef857c440e120bb6bea97773ce48c2.zip
kernel: ltq-deu: Fix compilation with Linux 5.15
struct of_device_id is not implicitly included anymore. Include <linux/mod_devicetable.h> to fix compilation on Linux 5.15. Also upstream commit a24d22b225ce15 ("crypto: sha - split sha.h into sha1.h and sha2.h") from Linux 5.11 moves functionality from sha.h to sha1.h. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Diffstat (limited to 'package')
-rw-r--r--package/kernel/lantiq/ltq-deu/src/ifxmips_deu.c1
-rw-r--r--package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c5
-rw-r--r--package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c5
3 files changed, 11 insertions, 0 deletions
diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu.c
index a102568f97..096b8b5bba 100644
--- a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu.c
+++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu.c
@@ -46,6 +46,7 @@
#include <linux/modversions.h>
#endif
#include <linux/module.h>
+#include <linux/mod_devicetable.h>
#include <linux/init.h>
#include <linux/types.h>
#include <linux/errno.h>
diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c
index a20430c448..0e860b9ab5 100644
--- a/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c
+++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c
@@ -43,7 +43,12 @@
#include <linux/module.h>
#include <linux/mm.h>
#include <linux/crypto.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,11,0)
#include <crypto/sha.h>
+#else
+#include <crypto/sha1.h>
+#endif
#include <crypto/hash.h>
#include <crypto/internal/hash.h>
#include <linux/types.h>
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 69504efe93..b58a91a5df 100644
--- a/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c
+++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c
@@ -44,7 +44,12 @@
#include <linux/mm.h>
#include <linux/crypto.h>
#include <crypto/internal/hash.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,11,0)
#include <crypto/sha.h>
+#else
+#include <crypto/sha1.h>
+#endif
#include <linux/types.h>
#include <linux/scatterlist.h>
#include <asm/byteorder.h>