diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/alpha/include/asm/pci.h | 2 | ||||
-rw-r--r-- | arch/arm/include/asm/pci.h | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/pci.h | 2 | ||||
-rw-r--r-- | arch/frv/include/asm/pci.h | 2 | ||||
-rw-r--r-- | arch/ia64/include/asm/pci.h | 2 | ||||
-rw-r--r-- | arch/mips/include/asm/pci.h | 2 | ||||
-rw-r--r-- | arch/parisc/include/asm/pci.h | 2 | ||||
-rw-r--r-- | arch/powerpc/include/asm/pci.h | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/pci.h | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/pci.h | 2 | ||||
-rw-r--r-- | arch/x86/include/asm/pci.h | 2 | ||||
-rw-r--r-- | arch/xtensa/include/asm/pci.h | 2 |
12 files changed, 0 insertions, 24 deletions
diff --git a/arch/alpha/include/asm/pci.h b/arch/alpha/include/asm/pci.h index 47659464ef45..e1846ba6aaba 100644 --- a/arch/alpha/include/asm/pci.h +++ b/arch/alpha/include/asm/pci.h | |||
@@ -119,8 +119,6 @@ pci_dma_mapping_error(struct pci_dev *pdev, dma_addr_t dma_addr) | |||
119 | extern void pci_unmap_single(struct pci_dev *, dma_addr_t, size_t, int); | 119 | extern void pci_unmap_single(struct pci_dev *, dma_addr_t, size_t, int); |
120 | extern void pci_unmap_page(struct pci_dev *, dma_addr_t, size_t, int); | 120 | extern void pci_unmap_page(struct pci_dev *, dma_addr_t, size_t, int); |
121 | 121 | ||
122 | #include <linux/pci-dma.h> | ||
123 | |||
124 | /* Map a set of buffers described by scatterlist in streaming mode for | 122 | /* Map a set of buffers described by scatterlist in streaming mode for |
125 | PCI DMA. This is the scatter-gather version of the above | 123 | PCI DMA. This is the scatter-gather version of the above |
126 | pci_map_single interface. Here the scatter gather list elements | 124 | pci_map_single interface. Here the scatter gather list elements |
diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h index aea3450dd27a..47980118d0a5 100644 --- a/arch/arm/include/asm/pci.h +++ b/arch/arm/include/asm/pci.h | |||
@@ -30,8 +30,6 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) | |||
30 | */ | 30 | */ |
31 | #define PCI_DMA_BUS_IS_PHYS (1) | 31 | #define PCI_DMA_BUS_IS_PHYS (1) |
32 | 32 | ||
33 | #include <linux/pci-dma.h> | ||
34 | |||
35 | #ifdef CONFIG_PCI | 33 | #ifdef CONFIG_PCI |
36 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, | 34 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, |
37 | enum pci_dma_burst_strategy *strat, | 35 | enum pci_dma_burst_strategy *strat, |
diff --git a/arch/cris/include/asm/pci.h b/arch/cris/include/asm/pci.h index 43cfa0ca0583..9f1cd56da28c 100644 --- a/arch/cris/include/asm/pci.h +++ b/arch/cris/include/asm/pci.h | |||
@@ -44,8 +44,6 @@ struct pci_dev; | |||
44 | */ | 44 | */ |
45 | #define PCI_DMA_BUS_IS_PHYS (1) | 45 | #define PCI_DMA_BUS_IS_PHYS (1) |
46 | 46 | ||
47 | #include <linux/pci-dma.h> | ||
48 | |||
49 | #define HAVE_PCI_MMAP | 47 | #define HAVE_PCI_MMAP |
50 | extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | 48 | extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, |
51 | enum pci_mmap_state mmap_state, int write_combine); | 49 | enum pci_mmap_state mmap_state, int write_combine); |
diff --git a/arch/frv/include/asm/pci.h b/arch/frv/include/asm/pci.h index 05db569e52e8..0d5997909850 100644 --- a/arch/frv/include/asm/pci.h +++ b/arch/frv/include/asm/pci.h | |||
@@ -43,8 +43,6 @@ extern void pci_free_consistent(struct pci_dev *hwdev, size_t size, | |||
43 | /* Return the index of the PCI controller for device PDEV. */ | 43 | /* Return the index of the PCI controller for device PDEV. */ |
44 | #define pci_controller_num(PDEV) (0) | 44 | #define pci_controller_num(PDEV) (0) |
45 | 45 | ||
46 | #include <linux/pci-dma.h> | ||
47 | |||
48 | #ifdef CONFIG_PCI | 46 | #ifdef CONFIG_PCI |
49 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, | 47 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, |
50 | enum pci_dma_burst_strategy *strat, | 48 | enum pci_dma_burst_strategy *strat, |
diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h index 4adf22762277..73b5f785e70c 100644 --- a/arch/ia64/include/asm/pci.h +++ b/arch/ia64/include/asm/pci.h | |||
@@ -56,8 +56,6 @@ pcibios_penalize_isa_irq (int irq, int active) | |||
56 | 56 | ||
57 | #include <asm-generic/pci-dma-compat.h> | 57 | #include <asm-generic/pci-dma-compat.h> |
58 | 58 | ||
59 | #include <linux/pci-dma.h> | ||
60 | |||
61 | #ifdef CONFIG_PCI | 59 | #ifdef CONFIG_PCI |
62 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, | 60 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, |
63 | enum pci_dma_burst_strategy *strat, | 61 | enum pci_dma_burst_strategy *strat, |
diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h index 9b196f8f7060..3beea1479b43 100644 --- a/arch/mips/include/asm/pci.h +++ b/arch/mips/include/asm/pci.h | |||
@@ -102,8 +102,6 @@ struct pci_dev; | |||
102 | */ | 102 | */ |
103 | extern unsigned int PCI_DMA_BUS_IS_PHYS; | 103 | extern unsigned int PCI_DMA_BUS_IS_PHYS; |
104 | 104 | ||
105 | #include <linux/pci-dma.h> | ||
106 | |||
107 | #ifdef CONFIG_PCI | 105 | #ifdef CONFIG_PCI |
108 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, | 106 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, |
109 | enum pci_dma_burst_strategy *strat, | 107 | enum pci_dma_burst_strategy *strat, |
diff --git a/arch/parisc/include/asm/pci.h b/arch/parisc/include/asm/pci.h index 632088d0aa67..2242a5c636c2 100644 --- a/arch/parisc/include/asm/pci.h +++ b/arch/parisc/include/asm/pci.h | |||
@@ -183,8 +183,6 @@ struct pci_bios_ops { | |||
183 | void (*fixup_bus)(struct pci_bus *bus); | 183 | void (*fixup_bus)(struct pci_bus *bus); |
184 | }; | 184 | }; |
185 | 185 | ||
186 | #include <linux/pci-dma.h> | ||
187 | |||
188 | /* | 186 | /* |
189 | ** Stuff declared in arch/parisc/kernel/pci.c | 187 | ** Stuff declared in arch/parisc/kernel/pci.c |
190 | */ | 188 | */ |
diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h index 4a9991ba249a..a20a9ad2258b 100644 --- a/arch/powerpc/include/asm/pci.h +++ b/arch/powerpc/include/asm/pci.h | |||
@@ -141,8 +141,6 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus, | |||
141 | 141 | ||
142 | #define HAVE_PCI_LEGACY 1 | 142 | #define HAVE_PCI_LEGACY 1 |
143 | 143 | ||
144 | #include <linux/pci-dma.h> | ||
145 | |||
146 | #ifdef CONFIG_PPC64 | 144 | #ifdef CONFIG_PPC64 |
147 | 145 | ||
148 | /* The PCI address space does not equal the physical memory address | 146 | /* The PCI address space does not equal the physical memory address |
diff --git a/arch/sh/include/asm/pci.h b/arch/sh/include/asm/pci.h index 991c2a424b24..8bd952fcf3ba 100644 --- a/arch/sh/include/asm/pci.h +++ b/arch/sh/include/asm/pci.h | |||
@@ -83,8 +83,6 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) | |||
83 | */ | 83 | */ |
84 | #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys) | 84 | #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys) |
85 | 85 | ||
86 | #include <linux/pci-dma.h> | ||
87 | |||
88 | #ifdef CONFIG_PCI | 86 | #ifdef CONFIG_PCI |
89 | /* | 87 | /* |
90 | * None of the SH PCI controllers support MWI, it is always treated as a | 88 | * None of the SH PCI controllers support MWI, it is always treated as a |
diff --git a/arch/sparc/include/asm/pci.h b/arch/sparc/include/asm/pci.h index 5ce773eded12..d9c031f9910f 100644 --- a/arch/sparc/include/asm/pci.h +++ b/arch/sparc/include/asm/pci.h | |||
@@ -6,8 +6,6 @@ | |||
6 | #include <asm/pci_32.h> | 6 | #include <asm/pci_32.h> |
7 | #endif | 7 | #endif |
8 | 8 | ||
9 | #include <linux/pci-dma.h> | ||
10 | |||
11 | #include <asm-generic/pci-dma-compat.h> | 9 | #include <asm-generic/pci-dma-compat.h> |
12 | 10 | ||
13 | #endif | 11 | #endif |
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index e2655dc9b9cd..404a880ea325 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h | |||
@@ -108,8 +108,6 @@ void dma32_reserve_bootmem(void); | |||
108 | /* implement the pci_ DMA API in terms of the generic device dma_ one */ | 108 | /* implement the pci_ DMA API in terms of the generic device dma_ one */ |
109 | #include <asm-generic/pci-dma-compat.h> | 109 | #include <asm-generic/pci-dma-compat.h> |
110 | 110 | ||
111 | #include <linux/pci-dma.h> | ||
112 | |||
113 | /* generic pci stuff */ | 111 | /* generic pci stuff */ |
114 | #include <asm-generic/pci.h> | 112 | #include <asm-generic/pci.h> |
115 | #define PCIBIOS_MAX_MEM_32 0xffffffff | 113 | #define PCIBIOS_MAX_MEM_32 0xffffffff |
diff --git a/arch/xtensa/include/asm/pci.h b/arch/xtensa/include/asm/pci.h index f3f0cf3439ad..4609b0f15f1f 100644 --- a/arch/xtensa/include/asm/pci.h +++ b/arch/xtensa/include/asm/pci.h | |||
@@ -56,8 +56,6 @@ struct pci_dev; | |||
56 | 56 | ||
57 | #define PCI_DMA_BUS_IS_PHYS (1) | 57 | #define PCI_DMA_BUS_IS_PHYS (1) |
58 | 58 | ||
59 | #include <linux/pci-dma.h> | ||
60 | |||
61 | /* Map a range of PCI memory or I/O space for a device into user space */ | 59 | /* Map a range of PCI memory or I/O space for a device into user space */ |
62 | int pci_mmap_page_range(struct pci_dev *pdev, struct vm_area_struct *vma, | 60 | int pci_mmap_page_range(struct pci_dev *pdev, struct vm_area_struct *vma, |
63 | enum pci_mmap_state mmap_state, int write_combine); | 61 | enum pci_mmap_state mmap_state, int write_combine); |