Merge branch 'i2c-next' of git://aeryn.fluff.org.uk/bjdooks/linux

[mv-sheeva.git] / include / asm-generic / memory_model.h

diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h
index 18546d8eb78e75303ddc6574f4ed128f70cea8fb..36fa286adad59a573fe13d82ee774e77841b4688 100644 (file)
--- a/include/asm-generic/memory_model.h
+++ b/include/asm-generic/memory_model.h
@@ -49,7 +49,7 @@
 
 /* memmap is virtually contigious.  */
 #define __pfn_to_page(pfn)     (vmemmap + (pfn))
-#define __page_to_pfn(page)    ((page) - vmemmap)
+#define __page_to_pfn(page)    (unsigned long)((page) - vmemmap)
 
 #elif defined(CONFIG_SPARSEMEM)
 /*