]> git.baikalelectronics.ru Git - kernel.git/commit
dma-mapping: fix build errors on !HAS_DMA architectures
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Fri, 13 Aug 2010 07:39:18 +0000 (09:39 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Aug 2010 19:03:24 +0000 (12:03 -0700)
commit6d48b5188398ca4eb7eb22fa631bbcbd6ac6dab5
treee466b1d9018e23a5e06216368a4885059eb89849
parent2a3489cc69c9112683b1c869981573ed09254b0f
dma-mapping: fix build errors on !HAS_DMA architectures

commit afc432c96ad0a9046faad99477702d6827dfc32b "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>
include/linux/dma-mapping.h