diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-21 19:35:11 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-21 19:35:11 +0100 |
| commit | 8552d28e140110fc935b39a6bfaf33c8ce3a1ad5 (patch) | |
| tree | 8102bc58bb5be253a7df0993d8d06a128cbc125e /arch/m68k/Kconfig.cpu | |
| parent | Merge tag '9p-for-5.11-rc1' of git://github.com/martinetd/linux (diff) | |
| parent | m68k: m68328: remove duplicate code (diff) | |
| download | linux-8552d28e140110fc935b39a6bfaf33c8ce3a1ad5.tar.xz linux-8552d28e140110fc935b39a6bfaf33c8ce3a1ad5.zip | |
Merge tag 'm68knommu-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer:
- cleanup of 68328 code
- align BSS section to 32bit
* tag 'm68knommu-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: m68328: remove duplicate code
m68k: m68328: move platform code to separate files
m68knommu: align BSS section to 4-byte boundaries
Diffstat (limited to 'arch/m68k/Kconfig.cpu')
| -rw-r--r-- | arch/m68k/Kconfig.cpu | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu index 7246aa50298e..f4d23977d2a5 100644 --- a/arch/m68k/Kconfig.cpu +++ b/arch/m68k/Kconfig.cpu @@ -36,7 +36,7 @@ endchoice if M68KCLASSIC config M68000 - bool "MC68000" + bool depends on !MMU select CPU_HAS_NO_BITFIELDS select CPU_HAS_NO_MULDIV64 @@ -103,7 +103,7 @@ config M68060 processor, say Y. Otherwise, say N. config M68328 - bool "MC68328" + bool depends on !MMU select LEGACY_TIMER_TICK select M68000 @@ -111,7 +111,7 @@ config M68328 Motorola 68328 processor support. config M68EZ328 - bool "MC68EZ328" + bool depends on !MMU select LEGACY_TIMER_TICK select M68000 @@ -119,7 +119,7 @@ config M68EZ328 Motorola 68EX328 processor support. config M68VZ328 - bool "MC68VZ328" + bool depends on !MMU select LEGACY_TIMER_TICK select M68000 |