From: Bjorn Helgaas Date: Fri, 29 Mar 2013 14:55:26 +0000 (-0600) Subject: Merge branch 'pci/shuah-defines' into next X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=833260631178aa26c70a0b05eabc953f5e47167d;p=openwrt%2Fstaging%2Fblogic.git 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 --- 833260631178aa26c70a0b05eabc953f5e47167d