diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-02 21:05:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-02 21:05:14 -0700 |
| commit | ca9c5ffd9d12e136f72fa52840cda83485d586cd (patch) | |
| tree | 55894647a47c69d563b7b135484c05f6c36a62d6 /include | |
| parent | c1fa238762ad2518ab6003983c16508470be6d81 (diff) | |
| parent | 7718457dc8fd98a9f61a5e42653161bac3904a65 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
Blackfin arch: remove zero-sized include/asm-blackfin/macros.h
Blackfin arch: update board defconfig files
Blackfin arch: Fix up remaining printks with proper log levels
Blackfin arch: Add proper -mcpu option according to the cpu and silicon revision configuration
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-blackfin/macros.h | 0 | ||||
| -rw-r--r-- | include/asm-blackfin/processor.h | 4 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/include/asm-blackfin/macros.h +++ /dev/null diff --git a/include/asm-blackfin/processor.h b/include/asm-blackfin/processor.h index aba2b30a8ed8..6bb3e0d4705d 100644 --- a/include/asm-blackfin/processor.h +++ b/include/asm-blackfin/processor.h @@ -124,6 +124,10 @@ static inline __attribute_pure__ uint32_t bfin_compiled_revid(void) return 4; #elif defined(CONFIG_BF_REV_0_5) return 5; +#elif defined(CONFIG_BF_REV_ANY) + return 0xffff; +#else + return -1; #endif } |