summaryrefslogtreecommitdiff
path: root/arch/m68k/sun3/sun3ints.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-10-11 07:39:38 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-10-11 07:39:38 +0200
commit620b74d01b9d4393bef6742bf121908322c2fe0b (patch)
tree507ab81bf701a1500b617526afa4232a0634a206 /arch/m68k/sun3/sun3ints.c
parentc326d3ed52c8b47f0de329b3b213dc32409d3656 (diff)
parent64570fbc14f8d7cb3fe3995f20e26bc25ce4b2cc (diff)
downloadlinux-620b74d01b9d4393bef6742bf121908322c2fe0b.tar.gz
linux-620b74d01b9d4393bef6742bf121908322c2fe0b.tar.bz2
linux-620b74d01b9d4393bef6742bf121908322c2fe0b.zip
Merge 5.15-rc5 into usb-next
We need the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/m68k/sun3/sun3ints.c')
-rw-r--r--arch/m68k/sun3/sun3ints.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/sun3/sun3ints.c b/arch/m68k/sun3/sun3ints.c
index 41ae422119d3..36cc280a4505 100644
--- a/arch/m68k/sun3/sun3ints.c
+++ b/arch/m68k/sun3/sun3ints.c
@@ -11,7 +11,6 @@
#include <linux/sched.h>
#include <linux/kernel_stat.h>
#include <linux/interrupt.h>
-#include <asm/segment.h>
#include <asm/intersil.h>
#include <asm/oplib.h>
#include <asm/sun3ints.h>