From fe4c1bfcfb0106dae4368b9ec75562ac903bf504 Mon Sep 17 00:00:00 2001 From: Tony Luck Date: Mon, 4 Aug 2008 13:39:28 -0700 Subject: [PATCH] --- yaml --- r: 107780 b: refs/heads/master c: ee694d6b4106ca09dcf23f839b44efd152a1da82 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/misc/Kconfig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e95af9f40b82..448f7783bc47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3351ab9b345ba5c2872acbf718cc631df72d3732 +refs/heads/master: ee694d6b4106ca09dcf23f839b44efd152a1da82 diff --git a/trunk/drivers/misc/Kconfig b/trunk/drivers/misc/Kconfig index 82af385460e4..a726f3b01a6b 100644 --- a/trunk/drivers/misc/Kconfig +++ b/trunk/drivers/misc/Kconfig @@ -427,10 +427,10 @@ config ENCLOSURE_SERVICES config SGI_XP tristate "Support communication between SGI SSIs" depends on NET - depends on IA64_GENERIC || IA64_SGI_SN2 || IA64_SGI_UV || (X86_64 && SMP) + depends on (IA64_GENERIC || IA64_SGI_SN2 || IA64_SGI_UV || X86_64) && SMP select IA64_UNCACHED_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2 select GENERIC_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2 - select SGI_GRU if IA64_GENERIC || IA64_SGI_UV || (X86_64 && SMP) + select SGI_GRU if (IA64_GENERIC || IA64_SGI_UV || X86_64) && SMP ---help--- An SGI machine can be divided into multiple Single System Images which act independently of each other and have