diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 04:17:15 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 04:17:15 -0400 |
| commit | 28638ea4f8adb63f837e4436560ab16ab0388587 (patch) | |
| tree | 2dab7a03d7696697c82ba62a03700d3a2f3639b1 /include/asm-blackfin/mach-bf527/blackfin.h | |
| parent | f781b03c4b1c713ac000877c8bbc31fc4164a29b (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into x86/nmi
Conflicts:
arch/x86/kernel/nmi_32.c
Diffstat (limited to 'include/asm-blackfin/mach-bf527/blackfin.h')
| -rw-r--r-- | include/asm-blackfin/mach-bf527/blackfin.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-blackfin/mach-bf527/blackfin.h b/include/asm-blackfin/mach-bf527/blackfin.h index 2891727b6176..297821e2d79a 100644 --- a/include/asm-blackfin/mach-bf527/blackfin.h +++ b/include/asm-blackfin/mach-bf527/blackfin.h | |||
| @@ -39,22 +39,22 @@ | |||
| 39 | #include "defBF522.h" | 39 | #include "defBF522.h" |
| 40 | #include "anomaly.h" | 40 | #include "anomaly.h" |
| 41 | 41 | ||
| 42 | #if defined(CONFIG_BF527) | 42 | #if defined(CONFIG_BF527) || defined(CONFIG_BF526) |
| 43 | #include "defBF527.h" | 43 | #include "defBF527.h" |
| 44 | #endif | 44 | #endif |
| 45 | 45 | ||
| 46 | #if defined(CONFIG_BF525) | 46 | #if defined(CONFIG_BF525) || defined(CONFIG_BF524) |
| 47 | #include "defBF525.h" | 47 | #include "defBF525.h" |
| 48 | #endif | 48 | #endif |
| 49 | 49 | ||
| 50 | #if !defined(__ASSEMBLY__) | 50 | #if !defined(__ASSEMBLY__) |
| 51 | #include "cdefBF522.h" | 51 | #include "cdefBF522.h" |
| 52 | 52 | ||
| 53 | #if defined(CONFIG_BF527) | 53 | #if defined(CONFIG_BF527) || defined(CONFIG_BF526) |
| 54 | #include "cdefBF527.h" | 54 | #include "cdefBF527.h" |
| 55 | #endif | 55 | #endif |
| 56 | 56 | ||
| 57 | #if defined(CONFIG_BF525) | 57 | #if defined(CONFIG_BF525) || defined(CONFIG_BF524) |
| 58 | #include "cdefBF525.h" | 58 | #include "cdefBF525.h" |
| 59 | #endif | 59 | #endif |
| 60 | #endif | 60 | #endif |