projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into upstream
[powerpc.git]
/
arch
/
mips
/
lib
/
iomap.c
diff --git
a/arch/mips/lib/iomap.c
b/arch/mips/lib/iomap.c
index
7e2ced7
..
f4ac5bb
100644
(file)
--- a/
arch/mips/lib/iomap.c
+++ b/
arch/mips/lib/iomap.c
@@
-63,7
+63,7
@@
void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
return ioport_map(start, len);
if (flags & IORESOURCE_MEM) {
if (flags & IORESOURCE_CACHEABLE)
- return ioremap_cach
eable_cow
(start, len);
+ return ioremap_cach
able
(start, len);
return ioremap_nocache(start, len);
}