diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /include/asm-sparc64/topology.h | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/asm-sparc64/topology.h')
| -rw-r--r-- | include/asm-sparc64/topology.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-sparc64/topology.h b/include/asm-sparc64/topology.h index 0e234e201bd6..98a6c613589d 100644 --- a/include/asm-sparc64/topology.h +++ b/include/asm-sparc64/topology.h | |||
| @@ -1,6 +1,9 @@ | |||
| 1 | #ifndef _ASM_SPARC64_TOPOLOGY_H | 1 | #ifndef _ASM_SPARC64_TOPOLOGY_H |
| 2 | #define _ASM_SPARC64_TOPOLOGY_H | 2 | #define _ASM_SPARC64_TOPOLOGY_H |
| 3 | 3 | ||
| 4 | #include <asm/spitfire.h> | ||
| 5 | #define smt_capable() (tlb_type == hypervisor) | ||
| 6 | |||
| 4 | #include <asm-generic/topology.h> | 7 | #include <asm-generic/topology.h> |
| 5 | 8 | ||
| 6 | #endif /* _ASM_SPARC64_TOPOLOGY_H */ | 9 | #endif /* _ASM_SPARC64_TOPOLOGY_H */ |