diff options
| author | Miklos Szeredi | 2010-08-19 23:13:40 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2010-08-20 18:34:55 +0200 |
| commit | f3c072ad727617f00bffae17dba8cd895f5b7bdb (patch) | |
| tree | adfc9f4da5f4ce01fb7e936bea2f6ec0ab9a68c4 /arch/um/Makefile-ppc | |
| parent | oom: __task_cred() need rcu_read_lock() (diff) | |
| download | kernel-qcow2-linux-f3c072ad727617f00bffae17dba8cd895f5b7bdb.tar.gz kernel-qcow2-linux-f3c072ad727617f00bffae17dba8cd895f5b7bdb.tar.xz kernel-qcow2-linux-f3c072ad727617f00bffae17dba8cd895f5b7bdb.zip | |
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/Makefile-ppc')
0 files changed, 0 insertions, 0 deletions