From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 29 Jan 2020 23:00:08 +0000 (-0600)
Subject: Merge branch 'remotes/lorenzo/pci/uniphier'
X-Git-Tag: ceph-for-5.6-rc2~95^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=01b810ed71878785d189d01e4d7425a11203d7a8;p=ceph-client.git

Merge branch 'remotes/lorenzo/pci/uniphier'

  - Remove unused modular code from uniphier, which cannot be built as a
    module (Masahiro Yamada)

* remotes/lorenzo/pci/uniphier:
  PCI: uniphier: remove module code from built-in driver
---

01b810ed71878785d189d01e4d7425a11203d7a8