summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 20:15:02 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 20:15:02 -0800
commit2c79c69adc6205fd115e4b1980c979e1e0e1828a (patch)
tree25dbbb2f428ac4167cd0ae5d1274472b4daa6f06
parentdb9effe99adc67c53e6aedadadd2aa9a02342e48 (diff)
parent5b026c4e3af52fda22c9313a3388344f82f3ba15 (diff)
downloadlinux-2c79c69adc6205fd115e4b1980c979e1e0e1828a.tar.bz2
Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6
* 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6: SFI: use ioremap_cache() instead of ioremap()
-rw-r--r--drivers/sfi/sfi_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/sfi/sfi_core.c b/drivers/sfi/sfi_core.c
index ceba593dc84f..04113e5304a0 100644
--- a/drivers/sfi/sfi_core.c
+++ b/drivers/sfi/sfi_core.c
@@ -101,7 +101,7 @@ static void __iomem * __ref sfi_map_memory(u64 phys, u32 size)
return NULL;
if (sfi_use_ioremap)
- return ioremap(phys, size);
+ return ioremap_cache(phys, size);
else
return early_ioremap(phys, size);
}