diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-01 14:45:47 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-01 14:45:47 -0500 |
commit | d2dbaad8555b9a078830ac1aab7ef7a37461c640 (patch) | |
tree | 6d455666df51db6a24834e6551e246e0c0d0d078 /arch/mips/lib/iomap.c | |
parent | cccc65a3b60edaf721cdee5a14f68ba009341822 (diff) | |
parent | 71efa38c0eef581c69c221ceb8645f61d1e93270 (diff) |
Merge branch 'master'
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 7e2ced715cfb..f4ac5bbcd81f 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) | |||
63 | return ioport_map(start, len); | 63 | return ioport_map(start, len); |
64 | if (flags & IORESOURCE_MEM) { | 64 | if (flags & IORESOURCE_MEM) { |
65 | if (flags & IORESOURCE_CACHEABLE) | 65 | if (flags & IORESOURCE_CACHEABLE) |
66 | return ioremap_cacheable_cow(start, len); | 66 | return ioremap_cachable(start, len); |
67 | return ioremap_nocache(start, len); | 67 | return ioremap_nocache(start, len); |
68 | } | 68 | } |
69 | 69 | ||