diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/microblaze/include/asm/pci.h | 2 | ||||
-rw-r--r-- | arch/microblaze/pci/pci-common.c | 15 |
2 files changed, 2 insertions, 15 deletions
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h index 5a388eeeb28f..2232ff942ba9 100644 --- a/arch/microblaze/include/asm/pci.h +++ b/arch/microblaze/include/asm/pci.h | |||
@@ -165,5 +165,7 @@ extern void __init xilinx_pci_init(void); | |||
165 | static inline void __init xilinx_pci_init(void) { return; } | 165 | static inline void __init xilinx_pci_init(void) { return; } |
166 | #endif | 166 | #endif |
167 | 167 | ||
168 | #include <asm-generic/pci-dma-compat.h> | ||
169 | |||
168 | #endif /* __KERNEL__ */ | 170 | #endif /* __KERNEL__ */ |
169 | #endif /* __ASM_MICROBLAZE_PCI_H */ | 171 | #endif /* __ASM_MICROBLAZE_PCI_H */ |
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c index 55ef532f32be..2bc57a836d71 100644 --- a/arch/microblaze/pci/pci-common.c +++ b/arch/microblaze/pci/pci-common.c | |||
@@ -60,21 +60,6 @@ struct dma_map_ops *get_pci_dma_ops(void) | |||
60 | } | 60 | } |
61 | EXPORT_SYMBOL(get_pci_dma_ops); | 61 | EXPORT_SYMBOL(get_pci_dma_ops); |
62 | 62 | ||
63 | int pci_set_dma_mask(struct pci_dev *dev, u64 mask) | ||
64 | { | ||
65 | return dma_set_mask(&dev->dev, mask); | ||
66 | } | ||
67 | |||
68 | int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) | ||
69 | { | ||
70 | int rc; | ||
71 | |||
72 | rc = dma_set_mask(&dev->dev, mask); | ||
73 | dev->dev.coherent_dma_mask = dev->dma_mask; | ||
74 | |||
75 | return rc; | ||
76 | } | ||
77 | |||
78 | struct pci_controller *pcibios_alloc_controller(struct device_node *dev) | 63 | struct pci_controller *pcibios_alloc_controller(struct device_node *dev) |
79 | { | 64 | { |
80 | struct pci_controller *phb; | 65 | struct pci_controller *phb; |