diff --git a/[refs] b/[refs]
index e34203507f52..a49cd5cc1236 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e83b98a79d25136282a1757f879c40ee929a28b
+refs/heads/master: 9f2ff54d7291d4386dc02d6a153e6cc621f32aa8
diff --git a/trunk/include/asm-blackfin/mach-bf527/mem_map.h b/trunk/include/asm-blackfin/mach-bf527/mem_map.h
index c5aa20102b24..bb046984231e 100644
--- a/trunk/include/asm-blackfin/mach-bf527/mem_map.h
+++ b/trunk/include/asm-blackfin/mach-bf527/mem_map.h
@@ -90,9 +90,7 @@
 
 /* Scratch Pad Memory */
 
-#if defined(CONFIG_BF527) || defined(CONFIG_BF536) || defined(CONFIG_BF534)
 #define L1_SCRATCH_START	0xFFB00000
 #define L1_SCRATCH_LENGTH	0x1000
-#endif
 
 #endif				/* _MEM_MAP_527_H_ */
diff --git a/trunk/include/asm-blackfin/mach-bf533/mem_map.h b/trunk/include/asm-blackfin/mach-bf533/mem_map.h
index 94d8c4062eb7..8daf6d4bf093 100644
--- a/trunk/include/asm-blackfin/mach-bf533/mem_map.h
+++ b/trunk/include/asm-blackfin/mach-bf533/mem_map.h
@@ -160,9 +160,7 @@
 
 /* Scratch Pad Memory */
 
-#if defined(CONFIG_BF533) || defined(CONFIG_BF532) || defined(CONFIG_BF531)
 #define L1_SCRATCH_START	0xFFB00000
 #define L1_SCRATCH_LENGTH	0x1000
-#endif
 
 #endif				/* _MEM_MAP_533_H_ */
diff --git a/trunk/include/asm-blackfin/mach-bf537/mem_map.h b/trunk/include/asm-blackfin/mach-bf537/mem_map.h
index 18759e38eaae..f5facdad4442 100644
--- a/trunk/include/asm-blackfin/mach-bf537/mem_map.h
+++ b/trunk/include/asm-blackfin/mach-bf537/mem_map.h
@@ -167,9 +167,7 @@
 
 /* Scratch Pad Memory */
 
-#if defined(CONFIG_BF537) || defined(CONFIG_BF536) || defined(CONFIG_BF534)
 #define L1_SCRATCH_START	0xFFB00000
 #define L1_SCRATCH_LENGTH	0x1000
-#endif
 
 #endif				/* _MEM_MAP_537_H_ */
diff --git a/trunk/include/asm-blackfin/mach-bf548/mem_map.h b/trunk/include/asm-blackfin/mach-bf548/mem_map.h
index ec1597e31831..bacec3455898 100644
--- a/trunk/include/asm-blackfin/mach-bf548/mem_map.h
+++ b/trunk/include/asm-blackfin/mach-bf548/mem_map.h
@@ -89,9 +89,7 @@
 
 /* Scratch Pad Memory */
 
-#if defined(CONFIG_BF54x)
 #define L1_SCRATCH_START	0xFFB00000
 #define L1_SCRATCH_LENGTH	0x1000
-#endif
 
 #endif/* _MEM_MAP_548_H_ */
diff --git a/trunk/include/asm-blackfin/mach-bf561/mem_map.h b/trunk/include/asm-blackfin/mach-bf561/mem_map.h
index f7ac09cf2c3d..300a3a90d61c 100644
--- a/trunk/include/asm-blackfin/mach-bf561/mem_map.h
+++ b/trunk/include/asm-blackfin/mach-bf561/mem_map.h
@@ -67,9 +67,7 @@
 
 /* Scratch Pad Memory */
 
-#if defined(CONFIG_BF561)
 #define L1_SCRATCH_START	0xFFB00000
 #define L1_SCRATCH_LENGTH	0x1000
-#endif
 
 #endif				/* _MEM_MAP_533_H_ */