Commit 02a737f4 authored by Linus Torvalds's avatar Linus Torvalds

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"
parents b6cc7a04 5aa52ccf
......@@ -15,7 +15,7 @@
#include "screen.h"
/***************************************************************************/
/* Init Drangon Engine hardware */
/* Init Dragon Engine II hardware */
/***************************************************************************/
static void dragen2_reset(void)
......
......@@ -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"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment