| commit | 833260631178aa26c70a0b05eabc953f5e47167d | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Fri Mar 29 08:55:26 2013 -0600 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Fri Mar 29 08:55:26 2013 -0600 |
| tree | 40e0daad672d14546cf810bfd77bb1006575a999 | |
| parent | f6161aa153581da4a3867a2d1a7caf4be19b6ec9 [diff] | |
| parent | 6f2729bab2cc386bb603698646dacd9ab6297ba0 [diff] |
Merge branch 'pci/shuah-defines' into next * pci/shuah-defines: iommu/amd: Remove calc_devid() and use PCI_DEVID() from PCI iommu/amd: Remove local PCI_BUS() define and use PCI_BUS_NUM() from PCI PCI/AER: Remove local PCI_BUS() define and use PCI_BUS_NUM() from PCI PCI: Add PCI_BUS_NUM() and PCI_DEVID() interfaces