diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2021-06-28 14:01:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2021-06-28 14:01:03 -0700 |
| commit | 17cfb9d332243f6d2551818df27d666d3dd70a23 (patch) | |
| tree | 2065b5335cf2f17eea5b4d34bf25c7cee1c5a8df /arch/m68k/kernel | |
| parent | Merge tag 'x86-splitlock-2021-06-28' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | m68k: atari: Fix ATARI_KBD_CORE kconfig unmet dependency warning (diff) | |
| download | linux-17cfb9d332243f6d2551818df27d666d3dd70a23.tar.gz linux-17cfb9d332243f6d2551818df27d666d3dd70a23.tar.bz2 linux-17cfb9d332243f6d2551818df27d666d3dd70a23.zip | |
Merge tag 'm68k-for-v5.14-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- update Finn's email address in MAINTAINERS
- defconfig updates
- minor fixes and improvements
* tag 'm68k-for-v5.14-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: atari: Fix ATARI_KBD_CORE kconfig unmet dependency warning
m68k: defconfig: Update defconfigs for v5.13-rc1
MAINTAINERS, .mailmap: Update Finn Thain's email address
m68k: dma: Remove unnecessary include of asm/cacheflush.h
m68k: Drop -fno-strength-reduce from KBUILD_CFLAGS
Diffstat (limited to 'arch/m68k/kernel')
| -rw-r--r-- | arch/m68k/kernel/dma.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/m68k/kernel/dma.c b/arch/m68k/kernel/dma.c index 1c1b875fadc1..2e192a5df949 100644 --- a/arch/m68k/kernel/dma.c +++ b/arch/m68k/kernel/dma.c @@ -34,9 +34,6 @@ pgprot_t pgprot_dmacoherent(pgprot_t prot) return prot; } #else - -#include <asm/cacheflush.h> - void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs) { |