projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a7c9d4c adedc05)
Merge branch 'pci/sparc'
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 6 Jun 2018 21:10:20 +0000 (16:10 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 6 Jun 2018 21:10:20 +0000 (16:10 -0500)
commit13fbadcd512c225c907d6e8147fb48a88114bf03
treea1edfbcec01503df2f55eec917e4b563217bd756tree | snapshot
parenta7c9d4cf45e1352c3fcca0fabfdf9d7ff708d2ffcommit | diff
parentadedc05e938fada9c39c89bdea80217355fce6e8commit | diff
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
John Crispins staging tree