4 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-blackfin/mach-bf533/blackfin.h b/include/asm-blackfin/mach-bf533/blackfin.h
index e4384491e972..f3b240abf170 100644
--- a/include/asm-blackfin/mach-bf533/blackfin.h
+++ b/include/asm-blackfin/mach-bf533/blackfin.h
@@ -38,7 +38,7 @@
 #include "defBF532.h"
 #include "anomaly.h"
-#if !(defined(__ASSEMBLY__) || defined(ASSEMBLY))
+#if !defined(__ASSEMBLY__)
 #include "cdefBF532.h"
 #endif
diff --git a/include/asm-blackfin/mach-bf537/blackfin.h b/include/asm-blackfin/mach-bf537/blackfin.h
index bbd97051ec9c..f196588a3ad0 100644
--- a/include/asm-blackfin/mach-bf537/blackfin.h
+++ b/include/asm-blackfin/mach-bf537/blackfin.h
@@ -43,7 +43,7 @@
 #include "defBF537.h"
 #endif
-#if !(defined(__ASSEMBLY__) || defined(ASSEMBLY))
+#if !defined(__ASSEMBLY__)
 #include "cdefBF534.h"
 /* UART 0*/
diff --git a/include/asm-blackfin/mach-bf548/blackfin.h b/include/asm-blackfin/mach-bf548/blackfin.h
index 791218fe7d94..19e84dd4c99c 100644
--- a/include/asm-blackfin/mach-bf548/blackfin.h
+++ b/include/asm-blackfin/mach-bf548/blackfin.h
@@ -54,7 +54,7 @@
 #include "defBF549.h"
 #endif
-#if !(defined(__ASSEMBLY__) || defined(ASSEMBLY))
+#if !defined(__ASSEMBLY__)
 #ifdef CONFIG_BF542
 #include "cdefBF542.h"
 #endif
diff --git a/include/asm-blackfin/mach-bf561/blackfin.h b/include/asm-blackfin/mach-bf561/blackfin.h
index 2537c845e8b0..562aee39895c 100644
--- a/include/asm-blackfin/mach-bf561/blackfin.h
+++ b/include/asm-blackfin/mach-bf561/blackfin.h
@@ -38,7 +38,7 @@
 #include "defBF561.h"
 #include "anomaly.h"
-#if !(defined(__ASSEMBLY__) || defined(ASSEMBLY))
+#if !defined(__ASSEMBLY__)
 #include "cdefBF561.h"
 #endif

diff --git a/include/asm-blackfin/mach-bf533/blackfin.h b/include/asm-blackfin/mach-bf533/blackfin.h index e4384491e972..f3b240abf170 100644 --- a/include/asm-blackfin/mach-bf533/blackfin.h +++ b/include/asm-blackfin/mach-bf533/blackfin.h
@@ -38,7 +38,7 @@
38	#include "defBF532.h"	38	#include "defBF532.h"
39	#include "anomaly.h"	39	#include "anomaly.h"
40		40
41	#if !(defined(__ASSEMBLY__) \|\| defined(ASSEMBLY))	41	#if !defined(__ASSEMBLY__)
42	#include "cdefBF532.h"	42	#include "cdefBF532.h"
43	#endif	43	#endif
44		44


diff --git a/include/asm-blackfin/mach-bf537/blackfin.h b/include/asm-blackfin/mach-bf537/blackfin.h index bbd97051ec9c..f196588a3ad0 100644 --- a/include/asm-blackfin/mach-bf537/blackfin.h +++ b/include/asm-blackfin/mach-bf537/blackfin.h
@@ -43,7 +43,7 @@
43	#include "defBF537.h"	43	#include "defBF537.h"
44	#endif	44	#endif
45		45
46	#if !(defined(__ASSEMBLY__) \|\| defined(ASSEMBLY))	46	#if !defined(__ASSEMBLY__)
47	#include "cdefBF534.h"	47	#include "cdefBF534.h"
48		48
49	/* UART 0*/	49	/* UART 0*/


diff --git a/include/asm-blackfin/mach-bf548/blackfin.h b/include/asm-blackfin/mach-bf548/blackfin.h index 791218fe7d94..19e84dd4c99c 100644 --- a/include/asm-blackfin/mach-bf548/blackfin.h +++ b/include/asm-blackfin/mach-bf548/blackfin.h
@@ -54,7 +54,7 @@
54	#include "defBF549.h"	54	#include "defBF549.h"
55	#endif	55	#endif
56		56
57	#if !(defined(__ASSEMBLY__) \|\| defined(ASSEMBLY))	57	#if !defined(__ASSEMBLY__)
58	#ifdef CONFIG_BF542	58	#ifdef CONFIG_BF542
59	#include "cdefBF542.h"	59	#include "cdefBF542.h"
60	#endif	60	#endif


diff --git a/include/asm-blackfin/mach-bf561/blackfin.h b/include/asm-blackfin/mach-bf561/blackfin.h index 2537c845e8b0..562aee39895c 100644 --- a/include/asm-blackfin/mach-bf561/blackfin.h +++ b/include/asm-blackfin/mach-bf561/blackfin.h
@@ -38,7 +38,7 @@
38	#include "defBF561.h"	38	#include "defBF561.h"
39	#include "anomaly.h"	39	#include "anomaly.h"
40		40
41	#if !(defined(__ASSEMBLY__) \|\| defined(ASSEMBLY))	41	#if !defined(__ASSEMBLY__)
42	#include "cdefBF561.h"	42	#include "cdefBF561.h"
43	#endif	43	#endif
44		44