diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
| commit | 15dd859cacf312f606f54502d1f66537a1e5c78c (patch) | |
| tree | e50e125eaa6da83fa715704e53c1bde013d1ef8e /arch/sparc/include/asm/system.h | |
| parent | b2d9d33412b9d13a40cd314d93ab517950fc5950 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge commit 'v2.6.27-rc1' into x86/core
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sparc/include/asm/system.h')
| -rw-r--r-- | arch/sparc/include/asm/system.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/system.h b/arch/sparc/include/asm/system.h new file mode 100644 index 00000000000..7944a7cfc99 --- /dev/null +++ b/arch/sparc/include/asm/system.h | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | #ifndef ___ASM_SPARC_SYSTEM_H | ||
| 2 | #define ___ASM_SPARC_SYSTEM_H | ||
| 3 | #if defined(__sparc__) && defined(__arch64__) | ||
| 4 | #include <asm/system_64.h> | ||
| 5 | #else | ||
| 6 | #include <asm/system_32.h> | ||
| 7 | #endif | ||
| 8 | #endif | ||