diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-09-27 13:27:20 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-09-27 13:27:20 -0600 |
| commit | d3c02799d32039ddd548c20680f7982b646ba3d8 (patch) | |
| tree | 43a928e1f100526293928cf6e43cf4f2c4ea0382 /drivers/pci/host | |
| parent | d95d3d53c7ef85ec0dc87db63aece18212c337b0 (diff) | |
| parent | 1e65249d4a0aa31a7862b9ed04e267d43a4fd267 (diff) | |
| download | linux-d3c02799d32039ddd548c20680f7982b646ba3d8.tar.bz2 | |
Merge branch 'pci/host-tegra' into next
* pci/host-tegra:
PCI: tegra: Add missing __iomem annotation
Diffstat (limited to 'drivers/pci/host')
| -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, list_for_each_entry(bus, &pcie->busses, list) if (bus->nr == busnr) - return bus->area->addr; + return (void __iomem *)bus->area->addr; bus = tegra_pcie_bus_alloc(pcie, busnr); if (IS_ERR(bus)) @@ -416,7 +416,7 @@ static void __iomem *tegra_pcie_bus_map(struct tegra_pcie *pcie, list_add_tail(&bus->list, &pcie->busses); - return bus->area->addr; + return (void __iomem *)bus->area->addr; } static void __iomem *tegra_pcie_conf_address(struct pci_bus *bus, |