Prev: partitions: fix build error in ibm partition detection code
Next: [PATCH] rtc: rtc-lpc32xx: Introduce RTC driver for the LPC32XX SoC (v2)
From: Miklos Szeredi on 12 Aug 2010 05:10
From: Miklos Szeredi <mszeredi(a)suse.cz>

Fix uml compile error:

include/linux/dma-mapping.h:145: error: redefinition of 'dma_get_cache_alignment'
/store/git/linux-2.6/arch/um/include/asm/dma-mapping.h:99: note: previous definition of 'dma_get_cache_alignment' was here

Introduced by this commit:

commit 4565f0170dfc849b3629c27d769db800467baa62
Author: FUJITA Tomonori <fujita.tomonori(a)lab.ntt.co.jp>
Date: Tue Aug 10 18:03:22 2010 -0700

dma-mapping: unify dma_get_cache_alignment implementations

Signed-off-by: Miklos Szeredi <mszeredi(a)suse.cz>
---
arch/um/include/asm/dma-mapping.h | 7 -------
1 file changed, 7 deletions(-)

Index: linux-2.6/arch/um/include/asm/dma-mapping.h
===================================================================
--- linux-2.6.orig/arch/um/include/asm/dma-mapping.h 2010-08-12 09:32:16.000000000 +0200
+++ linux-2.6/arch/um/include/asm/dma-mapping.h 2010-08-12 10:14:12.000000000 +0200
@@ -95,13 +95,6 @@ dma_sync_sg_for_cpu(struct device *dev,
#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)

-static inline int
-dma_get_cache_alignment(void)
-{
- BUG();
- return(0);
-}
-
static inline void
dma_cache_sync(struct device *dev, void *vaddr, size_t size,
enum dma_data_direction direction)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: partitions: fix build error in ibm partition detection code
Next: [PATCH] rtc: rtc-lpc32xx: Introduce RTC driver for the LPC32XX SoC (v2)