Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[mirror_ubuntu-focal-kernel.git] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index fa50e9ede0e6ca77aa10618a01a53c6209bb0d73..82af385460e4711643e79914cbe16ca1bff7e88e 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -426,9 +426,11 @@ 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)
        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)
        ---help---
          An SGI machine can be divided into multiple Single System
          Images which act independently of each other and have