summaryrefslogtreecommitdiffstats
path: root/include/linux/pci.h
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2018-10-20 11:45:30 -0500
committerBjorn Helgaas <bhelgaas@google.com>2018-10-20 11:45:30 -0500
commitee8360fdafac54eefd0df69fbd99338896cf806b (patch)
tree5a487142e6b7e592ad06657d5554b55d5b414557 /include/linux/pci.h
parent20634dc361e1c5fe2dae380a7d0a21ca7f32c4f7 (diff)
parentfe73c23d7a094f391dd358358f7dc358d430e7e1 (diff)
downloadlinux-ee8360fdafac54eefd0df69fbd99338896cf806b.tar.gz
linux-ee8360fdafac54eefd0df69fbd99338896cf806b.tar.bz2
linux-ee8360fdafac54eefd0df69fbd99338896cf806b.zip
Merge branch 'pci/misc'
- Remove unused Netronome NFP32xx Device IDs (Jakub Kicinski) - Use bitmap_zalloc() for dma_alias_mask (Andy Shevchenko) - Add switch fall-through annotations (Gustavo A. R. Silva) - Remove unused Switchtec quirk variable (Joshua Abraham) - Fix pci.c kernel-doc warning (Randy Dunlap) - Remove trivial PCI wrappers for DMA APIs (Christoph Hellwig) - Add Intel GPU device IDs to spurious interrupt quirk (Bin Meng) - Run Switchtec DMA aliasing quirk only on NTB endpoints to avoid useless dmesg errors (Logan Gunthorpe) - Update Switchtec NTB documentation (Wesley Yung) - Remove redundant "default n" from Kconfig (Bartlomiej Zolnierkiewicz) * pci/misc: PCI: pcie: Remove redundant 'default n' from Kconfig NTB: switchtec_ntb: Update switchtec documentation with prerequisites for NTB PCI: Fix Switchtec DMA aliasing quirk dmesg noise PCI: Add macro for Switchtec quirk declarations PCI: Add Device IDs for Intel GPU "spurious interrupt" quirk PCI: Remove pci_set_dma_max_seg_size() PCI: Remove pci_set_dma_seg_boundary() PCI: Remove pci_unmap_addr() wrappers for DMA API PCI / ACPI: Mark expected switch fall-through PCI: Remove set but unused variable PCI: Fix pci.c kernel-doc parameter warning PCI: Allocate dma_alias_mask with bitmap_zalloc() PCI: Remove unused NFP32xx IDs
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r--include/linux/pci.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 45f60110e2e1..7c4802de1e3a 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1344,7 +1344,6 @@ int pci_set_vga_state(struct pci_dev *pdev, bool decode,
/* kmem_cache style wrapper around pci_alloc_consistent() */
-#include <linux/pci-dma.h>
#include <linux/dmapool.h>
#define pci_pool dma_pool