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/Kconfig.cpu | |
| parent | 8aeab132e05fefc3a1a5277878629586bd7a3547 (diff) | |
| parent | 404b7577cee2dc302ae259604b163cabd9bfd4f3 (diff) | |
| download | linux-34fdd22c8fd9c5ebda999b5bb1bfe25f293bd030.tar.gz linux-34fdd22c8fd9c5ebda999b5bb1bfe25f293bd030.tar.bz2 linux-34fdd22c8fd9c5ebda999b5bb1bfe25f293bd030.zip | |
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/Kconfig.cpu')
| -rw-r--r-- | arch/m68k/Kconfig.cpu | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu index e0e9e31339c1..b0504b13b089 100644 --- a/arch/m68k/Kconfig.cpu +++ b/arch/m68k/Kconfig.cpu @@ -46,6 +46,7 @@ config M68000 select GENERIC_CSUM select CPU_NO_EFFICIENT_FFS select HAVE_ARCH_HASH + select LEGACY_TIMER_TICK help The Freescale (was Motorola) 68000 CPU is the first generation of the well known M68K family of processors. The CPU core as well as @@ -97,7 +98,6 @@ config M68060 config M68328 bool depends on !MMU - select LEGACY_TIMER_TICK select M68000 help Motorola 68328 processor support. @@ -105,7 +105,6 @@ config M68328 config M68EZ328 bool depends on !MMU - select LEGACY_TIMER_TICK select M68000 help Motorola 68EX328 processor support. @@ -113,7 +112,6 @@ config M68EZ328 config M68VZ328 bool depends on !MMU - select LEGACY_TIMER_TICK select M68000 help Motorola 68VZ328 processor support. |