From b99360a7fb29d3bf6eecfe85987eb835767acdc7 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Tue, 26 Jun 2012 21:02:54 +1000 Subject: [PATCH] --- yaml --- r: 316688 b: refs/heads/master c: b60f187fecee5d9dceb89773e15f976fe21d893a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/m68k/kernel/dma.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e9b5f13947f4..63c476e93ea1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b1e5a0626f7f921fe0fa24bdb256ae1de5ab9b0 +refs/heads/master: b60f187fecee5d9dceb89773e15f976fe21d893a diff --git a/trunk/arch/m68k/kernel/dma.c b/trunk/arch/m68k/kernel/dma.c index f6daf6e15d2e..27b5821f9712 100644 --- a/trunk/arch/m68k/kernel/dma.c +++ b/trunk/arch/m68k/kernel/dma.c @@ -16,7 +16,7 @@ #include -#ifdef CONFIG_MMU +#if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE) void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, gfp_t flag) @@ -96,7 +96,7 @@ void dma_free_coherent(struct device *dev, size_t size, free_pages((unsigned long)vaddr, get_order(size)); } -#endif /* CONFIG_MMU */ +#endif /* CONFIG_MMU && !CONFIG_COLDFIRE */ EXPORT_SYMBOL(dma_alloc_coherent); EXPORT_SYMBOL(dma_free_coherent);