diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2018-06-06 16:10:20 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-06-06 16:10:20 -0500 |
| commit | 13fbadcd512c225c907d6e8147fb48a88114bf03 (patch) | |
| tree | a1edfbcec01503df2f55eec917e4b563217bd756 /include/linux/pci_ids.h | |
| parent | Merge branch 'pci/resource' (diff) | |
| parent | sparc/PCI: Use dev_printk() when possible (diff) | |
| download | linux-dev-13fbadcd512c225c907d6e8147fb48a88114bf03.tar.xz linux-dev-13fbadcd512c225c907d6e8147fb48a88114bf03.zip | |
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
Diffstat (limited to 'include/linux/pci_ids.h')
0 files changed, 0 insertions, 0 deletions