diff options
| author | Linus Torvalds | 2021-09-01 18:31:45 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2021-09-01 18:31:45 -0700 |
| commit | 6104dde096eba9f443845686a2c4b3fa31129eb4 (patch) | |
| tree | f8677df0adcc573f5acf135adfddfaa2c7bc7674 /arch/arm | |
| parent | c07f191907e7d7e04034a2b9657a6bbf1355c60a (diff) | |
| parent | db87db65c1059f3be04506d122f8ec9b2fa3b05e (diff) | |
Merge tag 'm68knommu-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer:
"A collection of fixes:
- flexcan platform support (for m5441x)
- fix CONFIG_ROMKERNEL linking
- fix compilation when CONFIG_ISA_DMA_API is set
- fix local ColdFire clk_enable() for NULL clk"
* tag 'm68knommu-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: only set CONFIG_ISA_DMA_API for ColdFire sub-arch
m68k: coldfire: return success for clk_enable(NULL)
m68k: m5441x: add flexcan support
m68k: stmark2: update board setup
m68k/nommu: prevent setting ROMKERNEL when ROM is not set
Diffstat (limited to 'arch/arm')
0 files changed, 0 insertions, 0 deletions