summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-06 11:46:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-06 11:46:39 -0700
commit0016fe9d8a1ca99a4642735f41a7753d7c1f7e2b (patch)
tree492a2a9f18f07517f38eedb1f208a8efd9e56a7f /drivers/misc
parent8bc5fb6abb670fa9079cd1994f016a39f99698fe (diff)
parentbcbd2b65868213c1426654304de3da330cde6b3a (diff)
downloadlinux-0016fe9d8a1ca99a4642735f41a7753d7c1f7e2b.tar.bz2
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Update generic config [IA64] Fix uniprocessor build w.r.t. SGI_XP and SGI_GRU [IA64] Eliminate trailing backquote in IA64_SGI_UV [IA64] update generic_defconfig to support sn2. [IA64] update generic_defconfig for 2.6.27-rc1 [IA64] Allow ia64 to CONFIG_NR_CPUS up to 4096 [IA64] Cleanup generated file not ignored by .gitignore [IA64] pv_ops: fix ivt.S paravirtualization
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 82af385460e4..a726f3b01a6b 100644
--- a/drivers/misc/Kconfig
+++ b/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