tree adfc9f4da5f4ce01fb7e936bea2f6ec0ab9a68c4
parent 8d6c83f0ba5e1bd1e8bb2e3c7de4c276dc247f99
author Miklos Szeredi <mszeredi@suse.cz> 1282252420 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1282322095 -0700

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>