[Blackfin] arch: fix up - CONFIG_BLKFIN_WT was renamed CONFIG_BFIN_WT while the MPU...

Signed-off-by: Bernd Schmidt <bernds_cb1@t-online.de>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

diff --git a/arch/blackfin/kernel/cplb-mpu/cplbinit.c b/arch/blackfin/kernel/cplb-mpu/cplbinit.c
index dc6e8a7a8bda30ef21c08e5d50b73f5bbab13c54..7310e5fc6399b65afe503d1e1effe9083e9dd2f9 100644 (file)
--- a/arch/blackfin/kernel/cplb-mpu/cplbinit.c
+++ b/arch/blackfin/kernel/cplb-mpu/cplbinit.c
@@ -49,7 +49,7 @@ void __init generate_cpl_tables(void)
 
 #ifdef CONFIG_BFIN_DCACHE
        d_cache = CPLB_L1_CHBL;
-#ifdef CONFIG_BLKFIN_WT
+#ifdef CONFIG_BFIN_WT
        d_cache |= CPLB_L1_AOW | CPLB_WT;
 #endif
 #endif

diff --git a/arch/blackfin/kernel/cplb-mpu/cplbmgr.c b/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
index c426a22f99073e0669e26d280a4b5f93ecf385d1..0a30d62560736d08b065ba4e193db404215f8f09 100644 (file)
--- a/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
+++ b/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
@@ -149,7 +149,7 @@ static noinline int dcplb_miss(void)
        d_data = CPLB_SUPV_WR | CPLB_VALID | CPLB_DIRTY | PAGE_SIZE_4KB;
 #ifdef CONFIG_BFIN_DCACHE
        d_data |= CPLB_L1_CHBL | ANOMALY_05000158_WORKAROUND;
-#ifdef CONFIG_BLKFIN_WT
+#ifdef CONFIG_BFIN_WT
        d_data |= CPLB_L1_AOW | CPLB_WT;
 #endif
 #endif
@@ -319,7 +319,7 @@ void set_mask_dcplbs(unsigned long *masks)
        d_data = CPLB_SUPV_WR | CPLB_VALID | CPLB_DIRTY | PAGE_SIZE_4KB;
 #ifdef CONFIG_BFIN_DCACHE
        d_data |= CPLB_L1_CHBL;
-#ifdef CONFIG_BLKFIN_WT
+#ifdef CONFIG_BFIN_WT
        d_data |= CPLB_L1_AOW | CPLB_WT;
 #endif
 #endif