diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 20:15:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 20:15:02 -0800 |
| commit | 2c79c69adc6205fd115e4b1980c979e1e0e1828a (patch) | |
| tree | 25dbbb2f428ac4167cd0ae5d1274472b4daa6f06 | |
| parent | Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin (diff) | |
| parent | SFI: use ioremap_cache() instead of ioremap() (diff) | |
| download | linux-dev-2c79c69adc6205fd115e4b1980c979e1e0e1828a.tar.xz linux-dev-2c79c69adc6205fd115e4b1980c979e1e0e1828a.zip | |
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.c | 2 |
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); } |