diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 16:40:14 +0200 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 16:40:14 +0200 |
| commit | ff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch) | |
| tree | 85205005c611ab774702148558321c6fb92f1ccd /include/asm-sparc/topology.h | |
| parent | CPUFREQ: S3C24XX NAND driver frequency scaling support. (diff) | |
| parent | UBI: always start the background thread (diff) | |
| download | linux-ff877ea80efa2015b6263766f78ee42c2a1b32f9.tar.xz linux-ff877ea80efa2015b6263766f78ee42c2a1b32f9.zip | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
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 @@ -#ifndef _ASM_SPARC_TOPOLOGY_H -#define _ASM_SPARC_TOPOLOGY_H - -#include <asm-generic/topology.h> - -#endif /* _ASM_SPARC_TOPOLOGY_H */ +#ifndef ___ASM_SPARC_TOPOLOGY_H +#define ___ASM_SPARC_TOPOLOGY_H +#if defined(__sparc__) && defined(__arch64__) +#include <asm-sparc/topology_64.h> +#else +#include <asm-sparc/topology_32.h> +#endif +#endif |