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.c | |
| 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.c')
| -rw-r--r-- | drivers/pci/host/pci-keystone.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/host/pci-keystone.c b/drivers/pci/host/pci-keystone.c index c95608368508..1b893bc8b842 100644 --- a/drivers/pci/host/pci-keystone.c +++ b/drivers/pci/host/pci-keystone.c @@ -287,7 +287,7 @@ static struct pcie_host_ops keystone_pcie_host_ops = { .host_init = ks_pcie_host_init, .msi_set_irq = ks_dw_pcie_msi_set_irq, .msi_clear_irq = ks_dw_pcie_msi_clear_irq, - .get_msi_data = ks_dw_pcie_get_msi_data, + .get_msi_addr = ks_dw_pcie_get_msi_addr, .msi_host_init = ks_dw_pcie_msi_host_init, .scan_bus = ks_dw_pcie_v3_65_scan_bus, }; |