summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-08-28 17:29:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2023-08-28 17:29:09 -0700
commitbb2d9e5448ab9e86ecc79d8984dc6d3a8a9fba1e (patch)
treea02dd84b3829888542b573abd2c9a75f4bd04ff6 /drivers
parente5b7ca09e9aa4d483ab84c5f2ba88f0cc7c66540 (diff)
parenteb1e6ccdcf785e633863c5c7cec32d6c1e7b09dd (diff)
Merge tag 'm68k-for-v6.6-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: - Remove <asm/export.h> - Miscellaneous W=1 fixes - defconfig updates * tag 'm68k-for-v6.6-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: zorro: Include zorro.h in names.c m68k: Add memcmp() declaration m68k: Define __div64_32() to avoid a warning m68k: Remove <asm/export.h> m68k: Replace #include <asm/export.h> with #include <linux/export.h> m68k: defconfig: Update defconfigs for v6.5-rc1
Diffstat (limited to 'drivers')
-rw-r--r--drivers/zorro/names.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/zorro/names.c b/drivers/zorro/names.c
index fa3c83dbe843..077114ccc840 100644
--- a/drivers/zorro/names.c
+++ b/drivers/zorro/names.c
@@ -15,6 +15,7 @@
#include <linux/types.h>
#include <linux/zorro.h>
+#include "zorro.h"
struct zorro_prod_info {
__u16 prod;