Commit 67fbc231 authored by Russell King's avatar Russell King Committed by Russell King

[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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 3e7a7281
...@@ -30,10 +30,6 @@ typedef enum { ...@@ -30,10 +30,6 @@ typedef enum {
DMA_PRIO_LOW = 2 DMA_PRIO_LOW = 2
} pxa_dma_prio; } pxa_dma_prio;
#if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI)
#define HAVE_ARCH_PCI_SET_DMA_MASK 1
#endif
/* /*
* DMA registration * DMA registration
*/ */
......
...@@ -297,6 +297,8 @@ extern unsigned int get_memclk_frequency_10khz(void); ...@@ -297,6 +297,8 @@ extern unsigned int get_memclk_frequency_10khz(void);
#define PCIBIOS_MIN_IO 0 #define PCIBIOS_MIN_IO 0
#define PCIBIOS_MIN_MEM 0 #define PCIBIOS_MIN_MEM 0
#define pcibios_assign_all_busses() 1 #define pcibios_assign_all_busses() 1
#define HAVE_ARCH_PCI_SET_DMA_MASK 1
#endif #endif
#endif /* _ASM_ARCH_HARDWARE_H */ #endif /* _ASM_ARCH_HARDWARE_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment