Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

[linux-2.6] / include / asm-x86 / io_64.h

diff --git a/include/asm-x86/io_64.h b/include/asm-x86/io_64.h
index ee7a5c95596247897f05cbc593dfa7cf4dab49b8..f64a59cc396d5eaee13c7b0840df629f9c909733 100644 (file)
--- a/include/asm-x86/io_64.h
+++ b/include/asm-x86/io_64.h
@@ -166,7 +166,7 @@ extern void __iomem *ioremap_cache(unsigned long offset, unsigned long size);
  */
 static inline void __iomem *ioremap(unsigned long offset, unsigned long size)
 {
-       return ioremap_cache(offset, size);
+       return ioremap_nocache(offset, size);
 }
 
 extern void iounmap(volatile void __iomem *addr);