Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / arch / blackfin / kernel / cplb-nompu / cacheinit.c

diff --git a/arch/blackfin/kernel/cplb-nompu/cacheinit.c b/arch/blackfin/kernel/cplb-nompu/cacheinit.c
index 8a18399f607250e992b6db9e4c78f7a7d70ce4f3..bd0831592c2c85724e06092e998648b212719c06 100644 (file)
--- a/arch/blackfin/kernel/cplb-nompu/cacheinit.c
+++ b/arch/blackfin/kernel/cplb-nompu/cacheinit.c
@@ -25,7 +25,7 @@
 #include <asm/cplbinit.h>
 
 #if defined(CONFIG_BFIN_ICACHE)
-void bfin_icache_init(void)
+void __init bfin_icache_init(void)
 {
        unsigned long *table = icplb_table;
        unsigned long ctrl;
@@ -47,7 +47,7 @@ void bfin_icache_init(void)
 #endif
 
 #if defined(CONFIG_BFIN_DCACHE)
-void bfin_dcache_init(void)
+void __init bfin_dcache_init(void)
 {
        unsigned long *table = dcplb_table;
        unsigned long ctrl;