diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:34:22 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:34:22 -0400 |
commit | 6679ce6e5f519096612b480d255d9ca97be0c2be (patch) | |
tree | cce6814d3e7c62adf59e565fb6ae95fd409f86ab /arch/sparc/include/asm/processor.h | |
parent | 2c3d103ba90827cfb478bf10464d9b5b9cea369c (diff) | |
parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'arch/sparc/include/asm/processor.h')
-rw-r--r-- | arch/sparc/include/asm/processor.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/processor.h b/arch/sparc/include/asm/processor.h new file mode 100644 index 000000000000..9da9646bf6c6 --- /dev/null +++ b/arch/sparc/include/asm/processor.h | |||
@@ -0,0 +1,8 @@ | |||
1 | #ifndef ___ASM_SPARC_PROCESSOR_H | ||
2 | #define ___ASM_SPARC_PROCESSOR_H | ||
3 | #if defined(__sparc__) && defined(__arch64__) | ||
4 | #include <asm/processor_64.h> | ||
5 | #else | ||
6 | #include <asm/processor_32.h> | ||
7 | #endif | ||
8 | #endif | ||