]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'remotes/lorenzo/pci/ftpci100'
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 6 Jul 2021 15:56:29 +0000 (10:56 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 6 Jul 2021 15:56:29 +0000 (10:56 -0500)
commit8703842aab77bc585515ef7f5629559d9ee5ee2e
treebfdedb1c3a2bf047ac39873e01fe9dcf1ff2cbfe
parent28e7489131a736b042bbc233c4da46cdee65413e
parentf098d6f8192043466e6ef907c625649c08cb5911
Merge branch 'remotes/lorenzo/pci/ftpci100'

- Rename PCI_IOSIZE, etc in ftpci100 to avoid macro name collisions (Randy
  Dunlap)

* remotes/lorenzo/pci/ftpci100:
  PCI: ftpci100: Rename macro name collision