diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2010-08-19 14:13:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-20 09:34:55 -0700 |
| commit | f3c072ad727617f00bffae17dba8cd895f5b7bdb (patch) | |
| tree | adfc9f4da5f4ce01fb7e936bea2f6ec0ab9a68c4 /arch/um | |
| parent | 8d6c83f0ba5e1bd1e8bb2e3c7de4c276dc247f99 (diff) | |
| download | kernel_samsung_aries-f3c072ad727617f00bffae17dba8cd895f5b7bdb.zip kernel_samsung_aries-f3c072ad727617f00bffae17dba8cd895f5b7bdb.tar.gz kernel_samsung_aries-f3c072ad727617f00bffae17dba8cd895f5b7bdb.tar.bz2 | |
uml: fix compile error in dma_get_cache_alignment()
Fix uml compile error:
include/linux/dma-mapping.h:145: error: redefinition of 'dma_get_cache_alignment'
arch/um/include/asm/dma-mapping.h:99: note: previous definition of 'dma_get_cache_alignment' was here
Introduced by commit 4565f0170dfc ("dma-mapping: unify
dma_get_cache_alignment implementations")
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/include/asm/dma-mapping.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/um/include/asm/dma-mapping.h b/arch/um/include/asm/dma-mapping.h index 17a2cb5..1f469e80 100644 --- a/arch/um/include/asm/dma-mapping.h +++ b/arch/um/include/asm/dma-mapping.h @@ -95,13 +95,6 @@ dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems, #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) |