| commit | 13fbadcd512c225c907d6e8147fb48a88114bf03 | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Wed Jun 06 16:10:20 2018 -0500 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Wed Jun 06 16:10:20 2018 -0500 |
| tree | a1edfbcec01503df2f55eec917e4b563217bd756 | |
| parent | a7c9d4cf45e1352c3fcca0fabfdf9d7ff708d2ff [diff] | |
| parent | adedc05e938fada9c39c89bdea80217355fce6e8 [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