diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-29 13:24:24 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-29 13:24:24 -0600 |
| commit | 1104528bc769bef26f837097459e1a6e4dae240c (patch) | |
| tree | cd2a4c8bf4c929abd7dfff94b76b1ca8daf12b56 /drivers/pci/host/pci-keystone.h | |
| parent | c0ed74e9d026af7b4f79bc29aaac37aac5b6e0a4 (diff) | |
| parent | 24832b4de315ad00e5430a53772750dfcf18514d (diff) | |
Merge branch 'pci/host-designware' into next
* pci/host-designware:
PCI: designware: Add get_msi_data() to pcie_host_ops
PCI: designware: Rename get_msi_data() to get_msi_addr()
PCI: designware: Fix IO resource end address calculation
PCI: designware: Fix configuration base address when using 'reg'
PCI: designware: Use NULL instead of false
[bhelgaas: Fixup keystone for "PCI: designware: Rename get_msi_data() to
get_msi_addr()"]
Diffstat (limited to 'drivers/pci/host/pci-keystone.h')
| -rw-r--r-- | drivers/pci/host/pci-keystone.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/host/pci-keystone.h b/drivers/pci/host/pci-keystone.h index 80cfa8e80632..1fc1fceede9e 100644 --- a/drivers/pci/host/pci-keystone.h +++ b/drivers/pci/host/pci-keystone.h @@ -37,7 +37,7 @@ struct keystone_pcie { /* Keystone DW specific MSI controller APIs/definitions */ void ks_dw_pcie_handle_msi_irq(struct keystone_pcie *ks_pcie, int offset); -u32 ks_dw_pcie_get_msi_data(struct pcie_port *pp); +u32 ks_dw_pcie_get_msi_addr(struct pcie_port *pp); /* Keystone specific PCI controller APIs */ void ks_dw_pcie_enable_legacy_irqs(struct keystone_pcie *ks_pcie); |