From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 6 Jun 2018 21:10:20 +0000 (-0500)
Subject: Merge branch 'pci/sparc'
X-Git-Tag: v4.19~864^2~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=13fbadcd512c225c907d6e8147fb48a88114bf03;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'pci/sparc'

  - request legacy VGA framebuffer only for VGA devices to avoid false
    device conflicts (Bjorn Helgaas)

  - turn on PCI_COMMAND_IO & PCI_COMMAND_MEMORY in pci_enable_device() like
    everybody else, not in pcibios_fixup_bus() (Bjorn Helgaas)

* pci/sparc:
  sparc/PCI: Use dev_printk() when possible
  sparc32/PCI/PCIC: Converge device enable path
  sparc32/PCI/LEON: Converge device enable path
  sparc/PCI: Request legacy VGA framebuffer only for VGA devices
---

13fbadcd512c225c907d6e8147fb48a88114bf03