diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
| commit | 8725f25acc656c1522d48a6746055099efdaca4c (patch) | |
| tree | e241424fa58178ed6c2a95a4eb931ea83dbea33c /include/asm-sparc/topology.h | |
| parent | c69cccc95fe4b90dde5fe33e6a3b77880b534fa4 (diff) | |
| parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
Merge commit 'origin/master'
Manually fixed up:
drivers/net/fs_enet/fs_enet-main.c
Diffstat (limited to 'include/asm-sparc/topology.h')
| -rw-r--r-- | include/asm-sparc/topology.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/asm-sparc/topology.h b/include/asm-sparc/topology.h index ee5ac9c9da28..ed13630f32e2 100644 --- a/include/asm-sparc/topology.h +++ b/include/asm-sparc/topology.h | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | #ifndef _ASM_SPARC_TOPOLOGY_H | 1 | #ifndef ___ASM_SPARC_TOPOLOGY_H |
| 2 | #define _ASM_SPARC_TOPOLOGY_H | 2 | #define ___ASM_SPARC_TOPOLOGY_H |
| 3 | 3 | #if defined(__sparc__) && defined(__arch64__) | |
| 4 | #include <asm-generic/topology.h> | 4 | #include <asm-sparc/topology_64.h> |
| 5 | 5 | #else | |
| 6 | #endif /* _ASM_SPARC_TOPOLOGY_H */ | 6 | #include <asm-sparc/topology_32.h> |
| 7 | #endif | ||
| 8 | #endif | ||