diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-11 17:20:44 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-13 09:12:09 +0000 |
| commit | 67fbc2312312095acc2f19a0b601bac10f84cf9d (patch) | |
| tree | e33e8e2af363c7254fc22ebf5326046cc9a8df6e | |
| parent | 3e7a728117e4611b5e91fc567166f6e3606d996e (diff) | |
| download | op-kernel-dev-67fbc2312312095acc2f19a0b601bac10f84cf9d.zip op-kernel-dev-67fbc2312312095acc2f19a0b601bac10f84cf9d.tar.gz | |
[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 <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/dma.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/hardware.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/include/mach/dma.h b/arch/arm/mach-pxa/include/mach/dma.h index 955bfe6..7804637 100644 --- a/arch/arm/mach-pxa/include/mach/dma.h +++ b/arch/arm/mach-pxa/include/mach/dma.h @@ -30,10 +30,6 @@ typedef enum { DMA_PRIO_LOW = 2 } pxa_dma_prio; -#if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI) -#define HAVE_ARCH_PCI_SET_DMA_MASK 1 -#endif - /* * DMA registration */ 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 */ |
