Skip to content

Commit

Permalink
m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA
Browse files Browse the repository at this point in the history
In two places, we check !CONFIG_MMU_SUN3 while we should check
CONFIG_HAS_DMA instead.
While fixing this, the check in <asm/dma-mapping.h> became redundant
(<linux/dma-mapping.h> already handles this case), so just remove it.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
  • Loading branch information
Geert Uytterhoeven committed Feb 9, 2013
1 parent 243eeb7 commit 5618395
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
5 changes: 0 additions & 5 deletions arch/m68k/include/asm/dma-mapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

struct scatterlist;

#ifndef CONFIG_MMU_SUN3
static inline int dma_supported(struct device *dev, u64 mask)
{
return 1;
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions arch/m68k/kernel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 5618395

Please sign in to comment.