diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-28 09:14:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-28 09:14:09 -0800 |
| commit | b9756c047ce6b60e3b96aa3c5db958acbdacedde (patch) | |
| tree | 734a96bc44fc9d239935934551d7cba4658a1635 /arch/mips/lib/iomap.c | |
| parent | b54633056d626590f32912540500c8c20ce6d520 (diff) | |
| parent | 778e2ac5970e445f8c6b7d8aa597ac162afe270a (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'arch/mips/lib/iomap.c')
| -rw-r--r-- | arch/mips/lib/iomap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/lib/iomap.c b/arch/mips/lib/iomap.c index 7e2ced715cf..f4ac5bbcd81 100644 --- 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_cacheable_cow(start, len); + return ioremap_cachable(start, len); return ioremap_nocache(start, len); } |