From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Fri, 13 Aug 2010 07:39:18 +0000 (+0200)
Subject: dma-mapping: fix build errors on !HAS_DMA architectures
X-Git-Tag: v2.6.36-rc1~36
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e259f191f2244df04a7746fac1df8aa68ebd0106;p=pandora-kernel.git

dma-mapping: fix build errors on !HAS_DMA architectures

commit 4565f0170dfc849b3629c27d769db800467baa62 "dma-mapping: unify
dma_get_cache_alignment implementations" causes build errors on
!HAS_DMA architectures/platforms like s390 and sun3:

include/linux/dma-mapping.h:145: error: static declaration of 'dma_get_cache_alignment' follows non-static declaration
include/asm-generic/dma-mapping-broken.h:73: error: previous declaration of 'dma_get_cache_alignment' was here

Fix this by adding an explicit ifdef.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

Reading git-diff-tree failed