aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 18:41:53 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 18:41:53 -0800
commite3d8b77bc7a89d190ee895d0570af10c026e5086 (patch)
tree56f333679ac333abe2dcddce64e73fb211216044 /arch
parent9cfcceea8f7e8f5554e9c8130e568bcfa98a3a64 (diff)
parent0ad3a96f8ad910ecf87a25ec69ed360b284dee2e (diff)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 9f2093c1f44..d4de8a4814b 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -191,6 +191,7 @@ config IOSAPIC
config IA64_SGI_SN_XP
tristate "Support communication between SGI SSIs"
+ depends on IA64_GENERIC || IA64_SGI_SN2
select IA64_UNCACHED_ALLOCATOR
help
An SGI machine can be divided into multiple Single System