diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-07-07 12:56:44 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-07 12:58:28 +0200 |
| commit | b395fb36d59e17b9335805c10fa30fc51c8a94c6 (patch) | |
| tree | b96bc8eee33753e2a1b1181c62a028d7f89643d7 /drivers/pci/pci.h | |
| parent | fe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff) | |
| parent | 6b385b46ee17d7e1a68d3411b8cdb2342e0f0445 (diff) | |
Merge branch 'iommu-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu into core/iommu
Diffstat (limited to 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 731e20265ac..b7bf11dd546 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -184,8 +184,6 @@ pci_match_one_device(const struct pci_device_id *id, const struct pci_dev *dev) return NULL; } -struct pci_dev *pci_find_upstream_pcie_bridge(struct pci_dev *pdev); - /* PCI slot sysfs helper code */ #define to_pci_slot(s) container_of(s, struct pci_slot, kobj) |