Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...

* 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6:
  SFI: use ioremap_cache() instead of ioremap()

diff --git a/drivers/sfi/sfi_core.c b/drivers/sfi/sfi_core.c
index ceba593dc84fbcb994f1fb4968cab3b4adf05b83..04113e5304a01c0827b817079be3b4d32a7fc029 100644 (file)
--- 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);
 }