Merge branch 'pci/shuah-defines' into next

Browse source

* 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

...

This commit is contained in:

Bjorn Helgaas 2013-03-29 08:55:26 -06:00

parent f6161aa153 6f2729bab2

commit 8332606311

5 changed files with 44 additions and 40 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

14

drivers/iommu/amd_iommu.c

View file

40

drivers/iommu/amd_iommu_init.c

View file

11

drivers/iommu/amd_iommu_types.h

View file

4

drivers/pci/pcie/aer/aerdrv_core.c

View file

15

include/linux/pci.h

View file