diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2020-04-02 14:26:43 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-04-02 14:26:43 -0500 |
| commit | 86845e37aca4c80eace290a727a49caa8390febb (patch) | |
| tree | 56b644c875bd1db5a5ab4023a4efd370e4b4166c /drivers/media/platform/vimc/vimc-sensor.c | |
| parent | de71a000a15fc7beb2dedc84f7ea9c25d89e368d (diff) | |
| parent | 5799dac9c38a9585bc021bcb965623b835f24b1f (diff) | |
Merge branch 'pci/resource'
- Use ioremap(), not phys_to_virt() for platform ROM, to fix video ROM
mapping with CONFIG_HIGHMEM (Mikel Rychliski)
- Add support for root bus sizing so we don't have to assume host bridge
windows are known a priori (Ivan Kokshaysky)
- Fix alpha Nautilus PCI setup, which has been broken since we started
enforcing window limits in resource allocation (Ivan Kokshaysky)
* pci/resource:
alpha: Fix nautilus PCI setup
PCI: Add support for root bus sizing
PCI: Use ioremap(), not phys_to_virt() for platform ROM
Diffstat (limited to 'drivers/media/platform/vimc/vimc-sensor.c')
0 files changed, 0 insertions, 0 deletions