diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2018-04-04 13:28:13 -0500 |
---|---|---|
committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-04-04 13:28:13 -0500 |
commit | 0eb6de7872d9d7bfc9598912fe6332f72943f0aa (patch) | |
tree | 414d44c67db6854f3fdd0416abe053439469cb66 /drivers/pci | |
parent | 1e1b3201ab18df5f7beafa68581bc82a504b1575 (diff) | |
parent | 3758a191116f110a503a0c6cb7ce89bc81841baa (diff) | |
download | linux-0eb6de7872d9d7bfc9598912fe6332f72943f0aa.tar.bz2 |
Merge branch 'pci/sparc'
- support arbitrary PCI host bridge offsets on sparc (Yinghai Lu)
- remove System and Video ROM reservations on sparc (Bjorn Helgaas)
* pci/sparc:
sparc/PCI: Stop reserving System ROM and Video ROM in PCI space
sparc/PCI: Support arbitrary host bridge address offset
Diffstat (limited to 'drivers/pci')
0 files changed, 0 insertions, 0 deletions