diff options
-rw-r--r-- | include/asm-blackfin/blackfin.h | 6 | ||||
-rw-r--r-- | include/asm-blackfin/mach-bf533/cdefBF532.h | 8 | ||||
-rw-r--r-- | include/asm-blackfin/mach-bf537/cdefBF534.h | 2 | ||||
-rw-r--r-- | include/asm-blackfin/mach-bf548/cdefBF54x_base.h | 2 | ||||
-rw-r--r-- | include/asm-blackfin/mach-bf561/cdefBF561.h | 7 |
5 files changed, 13 insertions, 12 deletions
diff --git a/include/asm-blackfin/blackfin.h b/include/asm-blackfin/blackfin.h index 1b2dd5a3fe7a..5ecf0aa22347 100644 --- a/include/asm-blackfin/blackfin.h +++ b/include/asm-blackfin/blackfin.h | |||
@@ -11,8 +11,7 @@ | |||
11 | #define HI(con32) (((con32) >> 16) & 0xFFFF) | 11 | #define HI(con32) (((con32) >> 16) & 0xFFFF) |
12 | #define hi(con32) (((con32) >> 16) & 0xFFFF) | 12 | #define hi(con32) (((con32) >> 16) & 0xFFFF) |
13 | 13 | ||
14 | #include <asm/mach/blackfin.h> | 14 | #include <asm/mach/anomaly.h> |
15 | #include <asm/bfin-global.h> | ||
16 | 15 | ||
17 | #ifndef __ASSEMBLY__ | 16 | #ifndef __ASSEMBLY__ |
18 | 17 | ||
@@ -105,4 +104,7 @@ static inline void CSYNC(void) | |||
105 | 104 | ||
106 | #endif /* __ASSEMBLY__ */ | 105 | #endif /* __ASSEMBLY__ */ |
107 | 106 | ||
107 | #include <asm/mach/blackfin.h> | ||
108 | #include <asm/bfin-global.h> | ||
109 | |||
108 | #endif /* _BLACKFIN_H_ */ | 110 | #endif /* _BLACKFIN_H_ */ |
diff --git a/include/asm-blackfin/mach-bf533/cdefBF532.h b/include/asm-blackfin/mach-bf533/cdefBF532.h index 67a6dc49c521..40c1ad39dcab 100644 --- a/include/asm-blackfin/mach-bf533/cdefBF532.h +++ b/include/asm-blackfin/mach-bf533/cdefBF532.h | |||
@@ -30,11 +30,9 @@ | |||
30 | 30 | ||
31 | #ifndef _CDEF_BF532_H | 31 | #ifndef _CDEF_BF532_H |
32 | #define _CDEF_BF532_H | 32 | #define _CDEF_BF532_H |
33 | /* | 33 | |
34 | #if !defined(__ADSPLPBLACKFIN__) | 34 | #include <asm/blackfin.h> |
35 | #warning cdefBF532.h should only be included for 532 compatible chips. | 35 | |
36 | #endif | ||
37 | */ | ||
38 | /*include all Core registers and bit definitions*/ | 36 | /*include all Core registers and bit definitions*/ |
39 | #include "defBF532.h" | 37 | #include "defBF532.h" |
40 | 38 | ||
diff --git a/include/asm-blackfin/mach-bf537/cdefBF534.h b/include/asm-blackfin/mach-bf537/cdefBF534.h index 5dab41fb9c75..78227bc855df 100644 --- a/include/asm-blackfin/mach-bf537/cdefBF534.h +++ b/include/asm-blackfin/mach-bf537/cdefBF534.h | |||
@@ -32,6 +32,8 @@ | |||
32 | #ifndef _CDEF_BF534_H | 32 | #ifndef _CDEF_BF534_H |
33 | #define _CDEF_BF534_H | 33 | #define _CDEF_BF534_H |
34 | 34 | ||
35 | #include <asm/blackfin.h> | ||
36 | |||
35 | /* Include all Core registers and bit definitions */ | 37 | /* Include all Core registers and bit definitions */ |
36 | #include "defBF534.h" | 38 | #include "defBF534.h" |
37 | 39 | ||
diff --git a/include/asm-blackfin/mach-bf548/cdefBF54x_base.h b/include/asm-blackfin/mach-bf548/cdefBF54x_base.h index 10475bbfc7dd..aefab3f618c1 100644 --- a/include/asm-blackfin/mach-bf548/cdefBF54x_base.h +++ b/include/asm-blackfin/mach-bf548/cdefBF54x_base.h | |||
@@ -31,6 +31,8 @@ | |||
31 | #ifndef _CDEF_BF54X_H | 31 | #ifndef _CDEF_BF54X_H |
32 | #define _CDEF_BF54X_H | 32 | #define _CDEF_BF54X_H |
33 | 33 | ||
34 | #include <asm/blackfin.h> | ||
35 | |||
34 | #include "defBF54x_base.h" | 36 | #include "defBF54x_base.h" |
35 | #include <asm/system.h> | 37 | #include <asm/system.h> |
36 | 38 | ||
diff --git a/include/asm-blackfin/mach-bf561/cdefBF561.h b/include/asm-blackfin/mach-bf561/cdefBF561.h index 2efcd2c663ab..d667816486c0 100644 --- a/include/asm-blackfin/mach-bf561/cdefBF561.h +++ b/include/asm-blackfin/mach-bf561/cdefBF561.h | |||
@@ -31,11 +31,8 @@ | |||
31 | #ifndef _CDEF_BF561_H | 31 | #ifndef _CDEF_BF561_H |
32 | #define _CDEF_BF561_H | 32 | #define _CDEF_BF561_H |
33 | 33 | ||
34 | /* | 34 | #include <asm/blackfin.h> |
35 | #if !defined(__ADSPBF561__) | 35 | |
36 | #warning cdefBF561.h should only be included for BF561 chip. | ||
37 | #endif | ||
38 | */ | ||
39 | /* include all Core registers and bit definitions */ | 36 | /* include all Core registers and bit definitions */ |
40 | #include "defBF561.h" | 37 | #include "defBF561.h" |
41 | 38 | ||