diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 02:27:00 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 02:27:00 +0400 |
| commit | e177bb587ea0fade3d9a86f6667da8d89bea3607 (patch) | |
| tree | daebf1786d014cc3182137c76e02381d0aceb245 /arch/m68k | |
| parent | 55529fa5762462beb39f913c5277cb96c7be0858 (diff) | |
| parent | 561839598e61f03c9175183ea066b2b7fa58ce85 (diff) | |
| download | linux-e177bb587ea0fade3d9a86f6667da8d89bea3607.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k update from Geert Uytterhoeven.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA
swim: Add missing spinlock init
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/asm/dma-mapping.h | 5 | ||||
| -rw-r--r-- | arch/m68k/kernel/Makefile | 4 |
2 files changed, 1 insertions, 8 deletions
diff --git a/arch/m68k/include/asm/dma-mapping.h b/arch/m68k/include/asm/dma-mapping.h index 292805f0762e..05aa53594d49 100644 --- a/arch/m68k/include/asm/dma-mapping.h +++ b/arch/m68k/include/asm/dma-mapping.h @@ -5,7 +5,6 @@ struct scatterlist; -#ifndef CONFIG_MMU_SUN3 static inline int dma_supported(struct device *dev, u64 mask) { return 1; @@ -111,10 +110,6 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t handle) return 0; } -#else -#include <asm-generic/dma-mapping-broken.h> -#endif - /* drivers/base/dma-mapping.c */ extern int dma_common_mmap(struct device *dev, struct vm_area_struct *vma, void *cpu_addr, dma_addr_t dma_addr, size_t size); diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile index 068ad49210d6..655347d80780 100644 --- a/arch/m68k/kernel/Makefile +++ b/arch/m68k/kernel/Makefile @@ -20,7 +20,5 @@ obj-$(CONFIG_MMU_MOTOROLA) += ints.o vectors.o obj-$(CONFIG_MMU_SUN3) += ints.o vectors.o obj-$(CONFIG_PCI) += pcibios.o -ifndef CONFIG_MMU_SUN3 -obj-y += dma.o -endif +obj-$(CONFIG_HAS_DMA) += dma.o |