diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 21:41:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 21:41:53 -0500 |
| commit | e3d8b77bc7a89d190ee895d0570af10c026e5086 (patch) | |
| tree | 56f333679ac333abe2dcddce64e73fb211216044 /arch | |
| parent | 9cfcceea8f7e8f5554e9c8130e568bcfa98a3a64 (diff) | |
| parent | 0ad3a96f8ad910ecf87a25ec69ed360b284dee2e (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/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 9f2093c1f44b..d4de8a4814be 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -191,6 +191,7 @@ config IOSAPIC | |||
| 191 | 191 | ||
| 192 | config IA64_SGI_SN_XP | 192 | config IA64_SGI_SN_XP |
| 193 | tristate "Support communication between SGI SSIs" | 193 | tristate "Support communication between SGI SSIs" |
| 194 | depends on IA64_GENERIC || IA64_SGI_SN2 | ||
| 194 | select IA64_UNCACHED_ALLOCATOR | 195 | select IA64_UNCACHED_ALLOCATOR |
| 195 | help | 196 | help |
| 196 | An SGI machine can be divided into multiple Single System | 197 | An SGI machine can be divided into multiple Single System |