Merge branch 'pci/shuah-defines' into next
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 29 Mar 2013 14:55:26 +0000 (08:55 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 29 Mar 2013 14:55:26 +0000 (08:55 -0600)
commit833260631178aa26c70a0b05eabc953f5e47167d
tree40e0daad672d14546cf810bfd77bb1006575a999
parentf6161aa153581da4a3867a2d1a7caf4be19b6ec9
parent6f2729bab2cc386bb603698646dacd9ab6297ba0
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