diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2023-02-27 09:31:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2023-02-27 09:31:02 -0800 |
| commit | 02a737f4bb22fd72bffb5b4008bbcb773218b5dd (patch) | |
| tree | 18e03bf2517e1188d8d03b4c19f5f21fc4969d74 /arch/m68k | |
| parent | Merge tag 'csky-for-linus-6.3' of https://github.com/c-sky/csky-linux (diff) | |
| parent | m68k: nommu: Fix misspellings of "DragonEngine" (diff) | |
| download | linux-02a737f4bb22fd72bffb5b4008bbcb773218b5dd.tar.gz linux-02a737f4bb22fd72bffb5b4008bbcb773218b5dd.tar.bz2 linux-02a737f4bb22fd72bffb5b4008bbcb773218b5dd.zip | |
Merge tag 'm68knommu-for-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer:
- spelling fixes
* tag 'm68knommu-for-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: nommu: Fix misspellings of "DragonEngine"
m68k: nommu: Fix misspellings of "uCdimm"
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/68000/dragen2.c | 2 | ||||
| -rw-r--r-- | arch/m68k/Kconfig.machine | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/m68k/68000/dragen2.c b/arch/m68k/68000/dragen2.c index 1a57eff28cfe..7f1804e31a06 100644 --- a/arch/m68k/68000/dragen2.c +++ b/arch/m68k/68000/dragen2.c @@ -15,7 +15,7 @@ #include "screen.h" /***************************************************************************/ -/* Init Drangon Engine hardware */ +/* Init Dragon Engine II hardware */ /***************************************************************************/ static void dragen2_reset(void) diff --git a/arch/m68k/Kconfig.machine b/arch/m68k/Kconfig.machine index 53c45ccda564..e2f961208f18 100644 --- a/arch/m68k/Kconfig.machine +++ b/arch/m68k/Kconfig.machine @@ -192,18 +192,18 @@ config UCSIMM Support for the Arcturus Networks uCsimm module. config UCDIMM - bool "uDsimm module support" + bool "uCdimm module support" depends on !MMU select M68VZ328 help - Support for the Arcturus Networks uDsimm module. + Support for the Arcturus Networks uCdimm module. config DRAGEN2 - bool "DragenEngine II board support" + bool "DragonEngine II board support" depends on !MMU select M68VZ328 help - Support for the DragenEngine II board. + Support for the DragonEngine II board. config DIRECT_IO_ACCESS bool "Allow user to access IO directly" |