Commit f892027c authored Jan 09, 2010 by Peter Hüwe Committed by Russell King Jan 10, 2010

ARM: 5870/1: arch/arm: Fix build failure for defconfigs without CONFIG_ISA_DMA_API set

A lot of ARM-defconfigs (those without CONFIG_ISA_DMA_API set) fail to
build [1][2][3] due to the changes of the patch
    [PATCH] PCI: Clean up build for CONFIG_PCI_QUIRKS unset
    by Rafael J. Wysocki (Sat, 2 Jan 2010 22:57:24 +0100) [4]
as the referenced variable 'isa_dma_bridge_buggy' in asm/dma.h is
enclosed by the CONFIG_ISA_DMA_API conditional all configs without this
setting fail to build.

I'm not sure wether moving the condition is the right way to solve the
issue, but atleast it fixes the issue :)

References:
[1] http://kisskb.ellerman.id.au/kisskb/buildresult/1983354/
[2] http://kisskb.ellerman.id.au/kisskb/buildresult/1983333/
[3] http://kisskb.ellerman.id.au/kisskb/buildresult/1983337/
[4] http://lkml.org/lkml/2010/1/2/102



Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 0de9a00f

arch/arm/include/asm/dma.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -138,12 +138,12 @@ extern int get_dma_residue(unsigned int chan);
		#define NO_DMA 255
		#endif

		#endif /* CONFIG_ISA_DMA_API */

		#ifdef CONFIG_PCI
		extern int isa_dma_bridge_buggy;
		#else
		#define isa_dma_bridge_buggy (0)
		#endif

		#endif /* CONFIG_ISA_DMA_API */

		#endif /* __ASM_ARM_DMA_H */