diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-30 19:56:18 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-30 19:56:18 +0200 |
commit | 2d2da475ac0eebfbf40e5c5ca8c0409d62d23424 (patch) | |
tree | 2eecb1c2010924a767fcff86c9d80a6d1ac26b31 /arch/m68k/coldfire/intc.c | |
parent | Merge tag 'dmaengine-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
parent | m68knommu: fix 68000 CPU link with no platform selected (diff) | |
download | linux-2d2da475ac0eebfbf40e5c5ca8c0409d62d23424.tar.xz linux-2d2da475ac0eebfbf40e5c5ca8c0409d62d23424.zip |
Merge tag 'm68knommu-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer:
"A collection of changes to add elf-fdpic loader support for m68k.
Also a collection of various fixes. They include typo corrections,
undefined symbol compilation fixes, removal of the ISA_DMA_API support
and removal of unused code.
Summary:
- correctly set up ZERO_PAGE pointer
- drop ISA_DMA_API support
- fix comment typos
- fixes for undefined symbols
- remove unused code and variables
- elf-fdpic loader support for m68k"
* tag 'm68knommu-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: fix 68000 CPU link with no platform selected
m68k: removed unused "mach_get_ss"
m68knommu: fix undefined reference to `mach_get_rtc_pll'
m68knommu: fix undefined reference to `_init_sp'
m68knommu: allow elf_fdpic loader to be selected
m68knommu: add definitions to support elf_fdpic program loader
m68knommu: implement minimal regset support
m68knommu: use asm-generic/mmu.h for nommu setups
m68k: fix typos in comments
m68k: coldfire: drop ISA_DMA_API support
m68knommu: set ZERO_PAGE() to the allocated zeroed page
Diffstat (limited to 'arch/m68k/coldfire/intc.c')
-rw-r--r-- | arch/m68k/coldfire/intc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/coldfire/intc.c b/arch/m68k/coldfire/intc.c index cce257420388..20c084e932c8 100644 --- a/arch/m68k/coldfire/intc.c +++ b/arch/m68k/coldfire/intc.c @@ -28,7 +28,7 @@ unsigned char mcf_irq2imr[NR_IRQS]; /* - * Define the miniumun and maximum external interrupt numbers. + * Define the minimum and maximum external interrupt numbers. * This is also used as the "level" interrupt numbers. */ #define EIRQ1 25 |