浏览代码

[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>
Russell King 16 年之前
父节点
当前提交
67fbc23123
共有 2 个文件被更改,包括 2 次插入4 次删除
  1. 0 4
      arch/arm/mach-pxa/include/mach/dma.h
  2. 2 0
      arch/arm/mach-pxa/include/mach/hardware.h

+ 0 - 4
arch/arm/mach-pxa/include/mach/dma.h

@@ -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
  */
  */

+ 2 - 0
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_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 */