diff options
author | David S. Miller <davem@davemloft.net> | 2010-02-20 13:53:16 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-20 13:53:16 -0800 |
commit | 198d2f63a6096fe575b696b13ba61b62c620266f (patch) | |
tree | d0c2b0697370cc670029cd1eb2a80c35c71eac60 /arch/mips/mm/cache.c | |
parent | 0da2b300b91ddeb9944c3fb4faaf78c1c482c0af (diff) | |
parent | 1f474646fdc36b457606bbcd6a3592e6cbd31ac4 (diff) | |
download | kernel-crypto-198d2f63a6096fe575b696b13ba61b62c620266f.tar.gz kernel-crypto-198d2f63a6096fe575b696b13ba61b62c620266f.tar.xz kernel-crypto-198d2f63a6096fe575b696b13ba61b62c620266f.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/mips/mm/cache.c')
-rw-r--r-- | arch/mips/mm/cache.c | 2 |
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); |