Skip to content

Commit

Permalink
Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kern…
Browse files Browse the repository at this point in the history
…el/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()
  • Loading branch information
Linus Torvalds committed Jan 14, 2011
2 parents db9effe + 5b026c4 commit 2c79c69
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/sfi/sfi_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 2c79c69

Please sign in to comment.