diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-10 14:19:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-10 14:19:05 -0700 |
| commit | 34fdd22c8fd9c5ebda999b5bb1bfe25f293bd030 (patch) | |
| tree | 972889860bc4a11d703794c014ca037e660946e2 /arch/m68k/68000 | |
| parent | 8aeab132e05fefc3a1a5277878629586bd7a3547 (diff) | |
| parent | 404b7577cee2dc302ae259604b163cabd9bfd4f3 (diff) | |
Merge tag 'm68knommu-for-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer:
"Just a couple of changes. Fixes to compilation of the old/legacy
Freescale 68328 targets in some kernel configurations, and some
default configuration updates.
Summary:
- fix build problems for legacy 68328 targets
- clean out configs of removed options"
* tag 'm68knommu-for-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: update config files
m68knommu: fix non-mmu classic 68000 legacy timer tick selection
m68knommu: fix non-specific 68328 choice interrupt build failure
Diffstat (limited to 'arch/m68k/68000')
| -rw-r--r-- | arch/m68k/68000/ints.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/68000/ints.c b/arch/m68k/68000/ints.c index cda49b12d7be..f9a5ec781408 100644 --- a/arch/m68k/68000/ints.c +++ b/arch/m68k/68000/ints.c @@ -18,12 +18,12 @@ #include <asm/io.h> #include <asm/machdep.h> -#if defined(CONFIG_M68328) -#include <asm/MC68328.h> -#elif defined(CONFIG_M68EZ328) +#if defined(CONFIG_M68EZ328) #include <asm/MC68EZ328.h> #elif defined(CONFIG_M68VZ328) #include <asm/MC68VZ328.h> +#else +#include <asm/MC68328.h> #endif /* assembler routines */ |