From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Dec 2020 18:35:11 +0000 (-0800)
Subject: Merge tag 'm68knommu-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.11-rc1~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8552d28e140110fc935b39a6bfaf33c8ce3a1ad5;p=thirdparty%2Flinux.git

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
---

8552d28e140110fc935b39a6bfaf33c8ce3a1ad5
diff --cc arch/m68k/Kconfig.cpu
index 7246aa50298ee,a65ce76182326..f4d23977d2a5a
--- a/arch/m68k/Kconfig.cpu
+++ b/arch/m68k/Kconfig.cpu
@@@ -103,25 -102,22 +103,25 @@@ config M6806
  	  processor, say Y. Otherwise, say N.
  
  config M68328
- 	bool "MC68328"
+ 	bool
  	depends on !MMU
 +	select LEGACY_TIMER_TICK
  	select M68000
  	help
  	  Motorola 68328 processor support.
  
  config M68EZ328
- 	bool "MC68EZ328"
+ 	bool
  	depends on !MMU
 +	select LEGACY_TIMER_TICK
  	select M68000
  	help
  	  Motorola 68EX328 processor support.
  
  config M68VZ328
- 	bool "MC68VZ328"
+ 	bool
  	depends on !MMU
 +	select LEGACY_TIMER_TICK
  	select M68000
  	help
  	  Motorola 68VZ328 processor support.