From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 20 Apr 2023 21:16:36 +0000 (-0500)
Subject: Merge branch 'pci/controller/ixp4xx'
X-Git-Tag: v6.4-rc1~126^2^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73af737eea9e7ff5a99d10e709f7f1ad7c6abe36;p=thirdparty%2Flinux.git

Merge branch 'pci/controller/ixp4xx'

- Use the PCI_CONF1_ADDRESS() macro to simplify config space address
  computation (Pali Rohár)

* pci/controller/ixp4xx:
  PCI: ixp4xx: Use PCI_CONF1_ADDRESS() macro
---

73af737eea9e7ff5a99d10e709f7f1ad7c6abe36