diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-09-27 15:27:20 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-09-27 15:27:20 -0400 |
| commit | d3c02799d32039ddd548c20680f7982b646ba3d8 (patch) | |
| tree | 43a928e1f100526293928cf6e43cf4f2c4ea0382 | |
| parent | d95d3d53c7ef85ec0dc87db63aece18212c337b0 (diff) | |
| parent | 1e65249d4a0aa31a7862b9ed04e267d43a4fd267 (diff) | |
Merge branch 'pci/host-tegra' into next
* pci/host-tegra:
PCI: tegra: Add missing __iomem annotation
| -rw-r--r-- | drivers/pci/host/pci-tegra.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c index 2e9888a0635a..7c4f38dd42ba 100644 --- a/drivers/pci/host/pci-tegra.c +++ b/drivers/pci/host/pci-tegra.c | |||
| @@ -408,7 +408,7 @@ static void __iomem *tegra_pcie_bus_map(struct tegra_pcie *pcie, | |||
| 408 | 408 | ||
| 409 | list_for_each_entry(bus, &pcie->busses, list) | 409 | list_for_each_entry(bus, &pcie->busses, list) |
| 410 | if (bus->nr == busnr) | 410 | if (bus->nr == busnr) |
| 411 | return bus->area->addr; | 411 | return (void __iomem *)bus->area->addr; |
| 412 | 412 | ||
| 413 | bus = tegra_pcie_bus_alloc(pcie, busnr); | 413 | bus = tegra_pcie_bus_alloc(pcie, busnr); |
| 414 | if (IS_ERR(bus)) | 414 | if (IS_ERR(bus)) |
| @@ -416,7 +416,7 @@ static void __iomem *tegra_pcie_bus_map(struct tegra_pcie *pcie, | |||
| 416 | 416 | ||
| 417 | list_add_tail(&bus->list, &pcie->busses); | 417 | list_add_tail(&bus->list, &pcie->busses); |
| 418 | 418 | ||
| 419 | return bus->area->addr; | 419 | return (void __iomem *)bus->area->addr; |
| 420 | } | 420 | } |
| 421 | 421 | ||
| 422 | static void __iomem *tegra_pcie_conf_address(struct pci_bus *bus, | 422 | static void __iomem *tegra_pcie_conf_address(struct pci_bus *bus, |