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 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
lib
/
pci_iomap.c
diff --git
a/lib/pci_iomap.c
b/lib/pci_iomap.c
index
4b0fdc2
..
0d83ea8
100644
(file)
--- a/
lib/pci_iomap.c
+++ b/
lib/pci_iomap.c
@@
-34,7
+34,7
@@
void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
if (maxlen && len > maxlen)
len = maxlen;
if (flags & IORESOURCE_IO)
- return
ioport_map(
start, len);
+ return
__pci_ioport_map(dev,
start, len);
if (flags & IORESOURCE_MEM) {
if (flags & IORESOURCE_CACHEABLE)
return ioremap(start, len);