diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-11-14 12:11:22 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-11-14 12:11:22 -0600 |
| commit | 65a129d7847e4f5b24c6e56ab49090b1f6d0f3dc (patch) | |
| tree | bd99baf5e2a8658a1af86a3a2a1d8f128638d3aa /arch/sh | |
| parent | 8d666e53e07ac4562eb8ef73c1904d88522fcb8b (diff) | |
| parent | 505fb74664d534618258f4120d7e110a8b885c87 (diff) | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: Fix kernel-doc build warning
PCI: Move PCI_QUIRKS to the PCI bus menu
alpha/PCI: Make pdev_save_srm_config() static
PCI: Remove unused declarations
PCI: Remove redundant pci_dev, pci_bus, resource declarations
PCI: Remove redundant pcibios_set_master() declarations
PCI/PME: Handle invalid data when reading Root Status
x86/pci/intel_mid_pci: Constify intel_mid_pci_ops and make it __initconst
PCI: Constify pci_dev_type structure
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/asm/pci.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/sh/include/asm/pci.h b/arch/sh/include/asm/pci.h index 17fa69bc814d..6c2d68e08a57 100644 --- a/arch/sh/include/asm/pci.h +++ b/arch/sh/include/asm/pci.h @@ -63,13 +63,9 @@ extern int pci_is_66mhz_capable(struct pci_channel *hose, extern unsigned long PCIBIOS_MIN_IO, PCIBIOS_MIN_MEM; -struct pci_dev; - #define HAVE_PCI_MMAP #define ARCH_GENERIC_PCI_MMAP_RESOURCE -extern void pcibios_set_master(struct pci_dev *dev); - /* Dynamic DMA mapping stuff. * SuperH has everything mapped statically like x86. */ |