diff --git a/[refs] b/[refs]
index e2d875fd8bd0..f16e3a13f757 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 518d4bb7464dd3c04aeb23874dc360b54058c01e
+refs/heads/master: 9b287bf9924cedaf1accd7293db3627bef7c46e3
diff --git a/trunk/arch/mn10300/include/asm/cacheflush.h b/trunk/arch/mn10300/include/asm/cacheflush.h
index 0b5d00438374..a9f41688961a 100644
--- a/trunk/arch/mn10300/include/asm/cacheflush.h
+++ b/trunk/arch/mn10300/include/asm/cacheflush.h
@@ -22,18 +22,18 @@
 #ifdef CONFIG_MN10300_CACHE_ENABLED
 extern void mn10300_icache_inv(void);
 extern void mn10300_dcache_inv(void);
-extern void mn10300_dcache_inv_page(unsigned start);
-extern void mn10300_dcache_inv_range(unsigned start, unsigned end);
-extern void mn10300_dcache_inv_range2(unsigned start, unsigned size);
+extern void mn10300_dcache_inv_page(unsigned long start);
+extern void mn10300_dcache_inv_range(unsigned long start, unsigned long end);
+extern void mn10300_dcache_inv_range2(unsigned long start, unsigned long size);
 #ifdef CONFIG_MN10300_CACHE_WBACK
 extern void mn10300_dcache_flush(void);
-extern void mn10300_dcache_flush_page(unsigned start);
-extern void mn10300_dcache_flush_range(unsigned start, unsigned end);
-extern void mn10300_dcache_flush_range2(unsigned start, unsigned size);
+extern void mn10300_dcache_flush_page(unsigned long start);
+extern void mn10300_dcache_flush_range(unsigned long start, unsigned long end);
+extern void mn10300_dcache_flush_range2(unsigned long start, unsigned long size);
 extern void mn10300_dcache_flush_inv(void);
-extern void mn10300_dcache_flush_inv_page(unsigned start);
-extern void mn10300_dcache_flush_inv_range(unsigned start, unsigned end);
-extern void mn10300_dcache_flush_inv_range2(unsigned start, unsigned size);
+extern void mn10300_dcache_flush_inv_page(unsigned long start);
+extern void mn10300_dcache_flush_inv_range(unsigned long start, unsigned long end);
+extern void mn10300_dcache_flush_inv_range2(unsigned long start, unsigned long size);
 #else
 #define mn10300_dcache_flush()				do {} while (0)
 #define mn10300_dcache_flush_page(start)		do {} while (0)
diff --git a/trunk/arch/mn10300/mm/cache-flush-by-tag.S b/trunk/arch/mn10300/mm/cache-flush-by-tag.S
index c8ed1cbac107..8fe90e49b96c 100644
--- a/trunk/arch/mn10300/mm/cache-flush-by-tag.S
+++ b/trunk/arch/mn10300/mm/cache-flush-by-tag.S
@@ -62,9 +62,9 @@ mn10300_dcache_flush_end:
 
 ###############################################################################
 #
-# void mn10300_dcache_flush_page(unsigned start)
-# void mn10300_dcache_flush_range(unsigned start, unsigned end)
-# void mn10300_dcache_flush_range2(unsigned start, unsigned size)
+# void mn10300_dcache_flush_page(unsigned long start)
+# void mn10300_dcache_flush_range(unsigned long start, unsigned long end)
+# void mn10300_dcache_flush_range2(unsigned long start, unsigned long size)
 # Flush a range of addresses on a page in the dcache
 #
 ###############################################################################
@@ -142,9 +142,9 @@ mn10300_dcache_flush_inv_end:
 
 ###############################################################################
 #
-# void mn10300_dcache_flush_inv_page(unsigned start)
-# void mn10300_dcache_flush_inv_range(unsigned start, unsigned end)
-# void mn10300_dcache_flush_inv_range2(unsigned start, unsigned size)
+# void mn10300_dcache_flush_inv_page(unsigned long start)
+# void mn10300_dcache_flush_inv_range(unsigned long start, unsigned long end)
+# void mn10300_dcache_flush_inv_range2(unsigned long start, unsigned long size)
 # Flush and invalidate a range of addresses on a page in the dcache
 #
 ###############################################################################