From 67fbc2312312095acc2f19a0b601bac10f84cf9d Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 11 Dec 2008 17:20:44 +0000 Subject: [ARM] fix xm_x2xx_defconfig build errors drivers/built-in.o: In function `pci_set_consistent_dma_mask': hid-quirks.c:(.text+0x2664): multiple definition of `pci_set_consistent_dma_mask' drivers/built-in.o: In function `pci_set_dma_mask': hid-quirks.c:(.text+0x42c4): multiple definition of `pci_set_dma_mask' because drivers/pci/pci.c was not seeing the definition disabling these functions. Signed-off-by: Russell King --- arch/arm/mach-pxa/include/mach/hardware.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/mach-pxa/include/mach/hardware.h') diff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h index e2d6784..4e782ec 100644 --- a/arch/arm/mach-pxa/include/mach/hardware.h +++ b/arch/arm/mach-pxa/include/mach/hardware.h @@ -297,6 +297,8 @@ extern unsigned int get_memclk_frequency_10khz(void); #define PCIBIOS_MIN_IO 0 #define PCIBIOS_MIN_MEM 0 #define pcibios_assign_all_busses() 1 +#define HAVE_ARCH_PCI_SET_DMA_MASK 1 #endif + #endif /* _ASM_ARCH_HARDWARE_H */ -- cgit v1.1