Merge branches 'sh/serial-rework' and 'sh/oprofile'

[pandora-kernel.git] / arch / blackfin / include / asm / cplbinit.h

diff --git a/arch/blackfin/include/asm/cplbinit.h b/arch/blackfin/include/asm/cplbinit.h
index d179b74..f845b41 100644 (file)
--- a/arch/blackfin/include/asm/cplbinit.h
+++ b/arch/blackfin/include/asm/cplbinit.h
@@ -87,23 +87,6 @@ extern u_long dpdt_swapcount_table[];
 
 #endif /* CONFIG_MPU */
 
-extern unsigned long reserved_mem_dcache_on;
-extern unsigned long reserved_mem_icache_on;
-
 extern void generate_cplb_tables(void);
 
-static inline int bfin_addr_dcachable(unsigned long addr)
-{
-#ifdef CONFIG_BFIN_DCACHE
-       if (addr < (_ramend - DMA_UNCACHED_REGION))
-               return 1;
-#endif
-
-       if (reserved_mem_dcache_on &&
-               addr >= _ramend && addr < physical_mem_end)
-               return 1;
-
-       return 0;
-}
-
 #endif