commit d3c02799d32039ddd548c20680f7982b646ba3d8
author Bjorn Helgaas <bhelgaas@google.com> Fri Sep 27 13:27:20 2013 -0600
committer Bjorn Helgaas <bhelgaas@google.com> Fri Sep 27 13:27:20 2013 -0600
tree 43a928e1f100526293928cf6e43cf4f2c4ea0382
parent d95d3d53c7ef85ec0dc87db63aece18212c337b0
parent 1e65249d4a0aa31a7862b9ed04e267d43a4fd267

Merge branch 'pci/host-tegra' into next

* pci/host-tegra:
  PCI: tegra: Add missing __iomem annotation

drivers/pci/host/pci-tegra.c

diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c
index 2e9888a..7c4f38d 100644
--- a/drivers/pci/host/pci-tegra.c
+++ b/drivers/pci/host/pci-tegra.c
@@ -408,7 +408,7 @@
 
 	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 @@
 
 	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,