git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[pandora-kernel.git]
/
drivers
/
infiniband
/
hw
/
mthca
/
mthca_eq.c
diff --git
a/drivers/infiniband/hw/mthca/mthca_eq.c
b/drivers/infiniband/hw/mthca/mthca_eq.c
index
8e8c728
..
76785c6
100644
(file)
--- a/
drivers/infiniband/hw/mthca/mthca_eq.c
+++ b/
drivers/infiniband/hw/mthca/mthca_eq.c
@@
-653,7
+653,7
@@
static int mthca_map_reg(struct mthca_dev *dev,
unsigned long offset, unsigned long size,
void __iomem **map)
{
-
unsigned long
base = pci_resource_start(dev->pdev, 0);
+
phys_addr_t
base = pci_resource_start(dev->pdev, 0);
*map = ioremap(base + offset, size);
if (!*map)