Merge branch 'master' into for-2.6.34

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
index 102b2dfa542..e716cafc346 100644
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
@@ -155,7 +155,7 @@ static inline void setup_protection_map(void)
         protection_map[15] = PAGE_SHARED;
 }
 
-void __devinit cpu_cache_init(void)
+void __cpuinit cpu_cache_init(void)
 {
         if (cpu_has_3k_cache) {
                 extern void __weak r3k_cache_init(void);