diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-02-05 15:57:54 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-02-05 17:28:36 -0500 |
| commit | 5bd28338d681dcbde2c4bee4ebea0c4e0dfcd9e4 (patch) | |
| tree | d77bef7dfed7e5a475c0d3c1966602d0cdc6edcb | |
| parent | 5bbe029ff7bc8ff82ef31d3480d68c95642a3c7a (diff) | |
PCI: Remove includes of empty asm-generic/pci-bridge.h
include/asm-generic/pci-bridge.h is now empty, so remove every #include of
it.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Will Deacon <will.deacon@arm.com> (arm64)
| -rw-r--r-- | arch/alpha/include/asm/pci.h | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/pci.h | 3 | ||||
| -rw-r--r-- | arch/arm64/include/asm/pci.h | 1 | ||||
| -rw-r--r-- | arch/mips/include/asm/pci.h | 1 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/pci-bridge.h | 1 | ||||
| -rw-r--r-- | arch/unicore32/include/asm/pci.h | 2 | ||||
| -rw-r--r-- | arch/x86/pci/common.c | 1 | ||||
| -rw-r--r-- | drivers/of/of_pci.c | 1 | ||||
| -rw-r--r-- | drivers/pci/pci.c | 1 | ||||
| -rw-r--r-- | drivers/pci/probe.c | 1 | ||||
| -rw-r--r-- | drivers/pci/setup-bus.c | 1 |
11 files changed, 0 insertions, 14 deletions
diff --git a/arch/alpha/include/asm/pci.h b/arch/alpha/include/asm/pci.h index 98f2eeee8f68..75d8865d763d 100644 --- a/arch/alpha/include/asm/pci.h +++ b/arch/alpha/include/asm/pci.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #include <linux/dma-mapping.h> | 7 | #include <linux/dma-mapping.h> |
| 8 | #include <linux/scatterlist.h> | 8 | #include <linux/scatterlist.h> |
| 9 | #include <asm/machvec.h> | 9 | #include <asm/machvec.h> |
| 10 | #include <asm-generic/pci-bridge.h> | ||
| 11 | 10 | ||
| 12 | /* | 11 | /* |
| 13 | * The following structure is used to manage multiple PCI busses. | 12 | * The following structure is used to manage multiple PCI busses. |
diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h index a5635444ca41..d7de19a77d51 100644 --- a/arch/arm/include/asm/pci.h +++ b/arch/arm/include/asm/pci.h | |||
| @@ -3,8 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | #include <asm-generic/pci-dma-compat.h> | 5 | #include <asm-generic/pci-dma-compat.h> |
| 6 | #include <asm-generic/pci-bridge.h> | ||
| 7 | |||
| 8 | #include <asm/mach/pci.h> /* for pci_sys_data */ | 6 | #include <asm/mach/pci.h> /* for pci_sys_data */ |
| 9 | 7 | ||
| 10 | extern unsigned long pcibios_min_io; | 8 | extern unsigned long pcibios_min_io; |
| @@ -41,5 +39,4 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) | |||
| 41 | } | 39 | } |
| 42 | 40 | ||
| 43 | #endif /* __KERNEL__ */ | 41 | #endif /* __KERNEL__ */ |
| 44 | |||
| 45 | #endif | 42 | #endif |
diff --git a/arch/arm64/include/asm/pci.h b/arch/arm64/include/asm/pci.h index b008a72f8bc0..f75b04e8d732 100644 --- a/arch/arm64/include/asm/pci.h +++ b/arch/arm64/include/asm/pci.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #include <linux/dma-mapping.h> | 7 | #include <linux/dma-mapping.h> |
| 8 | 8 | ||
| 9 | #include <asm/io.h> | 9 | #include <asm/io.h> |
| 10 | #include <asm-generic/pci-bridge.h> | ||
| 11 | #include <asm-generic/pci-dma-compat.h> | 10 | #include <asm-generic/pci-dma-compat.h> |
| 12 | 11 | ||
| 13 | #define PCIBIOS_MIN_IO 0x1000 | 12 | #define PCIBIOS_MIN_IO 0x1000 |
diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h index 98c31e5d9579..108d19376bb1 100644 --- a/arch/mips/include/asm/pci.h +++ b/arch/mips/include/asm/pci.h | |||
| @@ -102,7 +102,6 @@ static inline void pci_resource_to_user(const struct pci_dev *dev, int bar, | |||
| 102 | #include <linux/scatterlist.h> | 102 | #include <linux/scatterlist.h> |
| 103 | #include <linux/string.h> | 103 | #include <linux/string.h> |
| 104 | #include <asm/io.h> | 104 | #include <asm/io.h> |
| 105 | #include <asm-generic/pci-bridge.h> | ||
| 106 | 105 | ||
| 107 | struct pci_dev; | 106 | struct pci_dev; |
| 108 | 107 | ||
diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h index 54843ca5fa2b..78968c1ff931 100644 --- a/arch/powerpc/include/asm/pci-bridge.h +++ b/arch/powerpc/include/asm/pci-bridge.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <linux/pci.h> | 10 | #include <linux/pci.h> |
| 11 | #include <linux/list.h> | 11 | #include <linux/list.h> |
| 12 | #include <linux/ioport.h> | 12 | #include <linux/ioport.h> |
| 13 | #include <asm-generic/pci-bridge.h> | ||
| 14 | 13 | ||
| 15 | struct device_node; | 14 | struct device_node; |
| 16 | 15 | ||
diff --git a/arch/unicore32/include/asm/pci.h b/arch/unicore32/include/asm/pci.h index 38b3f3785c3c..eb9dccecb338 100644 --- a/arch/unicore32/include/asm/pci.h +++ b/arch/unicore32/include/asm/pci.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | #ifdef __KERNEL__ | 15 | #ifdef __KERNEL__ |
| 16 | #include <asm-generic/pci-dma-compat.h> | 16 | #include <asm-generic/pci-dma-compat.h> |
| 17 | #include <asm-generic/pci-bridge.h> | ||
| 18 | #include <asm-generic/pci.h> | 17 | #include <asm-generic/pci.h> |
| 19 | #include <mach/hardware.h> /* for PCIBIOS_MIN_* */ | 18 | #include <mach/hardware.h> /* for PCIBIOS_MIN_* */ |
| 20 | 19 | ||
| @@ -23,5 +22,4 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | |||
| 23 | enum pci_mmap_state mmap_state, int write_combine); | 22 | enum pci_mmap_state mmap_state, int write_combine); |
| 24 | 23 | ||
| 25 | #endif /* __KERNEL__ */ | 24 | #endif /* __KERNEL__ */ |
| 26 | |||
| 27 | #endif | 25 | #endif |
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 2879efc73a96..b4a9f23d77d9 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <linux/dmi.h> | 12 | #include <linux/dmi.h> |
| 13 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
| 14 | 14 | ||
| 15 | #include <asm-generic/pci-bridge.h> | ||
| 16 | #include <asm/acpi.h> | 15 | #include <asm/acpi.h> |
| 17 | #include <asm/segment.h> | 16 | #include <asm/segment.h> |
| 18 | #include <asm/io.h> | 17 | #include <asm/io.h> |
diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c index b1449f71601c..13f4fed38048 100644 --- a/drivers/of/of_pci.c +++ b/drivers/of/of_pci.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #include <linux/of_device.h> | 5 | #include <linux/of_device.h> |
| 6 | #include <linux/of_pci.h> | 6 | #include <linux/of_pci.h> |
| 7 | #include <linux/slab.h> | 7 | #include <linux/slab.h> |
| 8 | #include <asm-generic/pci-bridge.h> | ||
| 9 | 8 | ||
| 10 | static inline int __of_pci_pci_compare(struct device_node *node, | 9 | static inline int __of_pci_pci_compare(struct device_node *node, |
| 11 | unsigned int data) | 10 | unsigned int data) |
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 602eb4223510..64c0a1215f84 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/device.h> | 25 | #include <linux/device.h> |
| 26 | #include <linux/pm_runtime.h> | 26 | #include <linux/pm_runtime.h> |
| 27 | #include <linux/pci_hotplug.h> | 27 | #include <linux/pci_hotplug.h> |
| 28 | #include <asm-generic/pci-bridge.h> | ||
| 29 | #include <asm/setup.h> | 28 | #include <asm/setup.h> |
| 30 | #include <linux/aer.h> | 29 | #include <linux/aer.h> |
| 31 | #include "pci.h" | 30 | #include "pci.h" |
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index ead1ac1dc1e3..5eb378fbe849 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/pci-aspm.h> | 15 | #include <linux/pci-aspm.h> |
| 16 | #include <linux/aer.h> | 16 | #include <linux/aer.h> |
| 17 | #include <linux/acpi.h> | 17 | #include <linux/acpi.h> |
| 18 | #include <asm-generic/pci-bridge.h> | ||
| 19 | #include "pci.h" | 18 | #include "pci.h" |
| 20 | 19 | ||
| 21 | #define CARDBUS_LATENCY_TIMER 176 /* secondary latency timer */ | 20 | #define CARDBUS_LATENCY_TIMER 176 /* secondary latency timer */ |
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 7796d0a5befa..55641a39a3e9 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/ioport.h> | 25 | #include <linux/ioport.h> |
| 26 | #include <linux/cache.h> | 26 | #include <linux/cache.h> |
| 27 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
| 28 | #include <asm-generic/pci-bridge.h> | ||
| 29 | #include "pci.h" | 28 | #include "pci.h" |
| 30 | 29 | ||
| 31 | unsigned int pci_flags; | 30 | unsigned int pci_flags; |
