Merge tag 'char-misc-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[sfrench/cifs-2.6.git] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 9042ba7baed60af948275cbaa3b341b30a230ce2..c55b63750757de10636ba421e1a7c3859d7105c8 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -126,18 +126,6 @@ config INTEL_MID_PTI
          an Intel Atom (non-netbook) mobile device containing a MIPI
          P1149.7 standard implementation.
 
-config SGI_IOC4
-       tristate "SGI IOC4 Base IO support"
-       depends on PCI
-       ---help---
-         This option enables basic support for the IOC4 chip on certain
-         SGI IO controller cards (IO9, IO10, and PCI-RT).  This option
-         does not enable any specific functions on such a card, but provides
-         necessary infrastructure for other drivers to utilize.
-
-         If you have an SGI Altix with an IOC4-based card say Y.
-         Otherwise say N.
-
 config TIFM_CORE
        tristate "TI Flash Media interface support"
        depends on PCI
@@ -200,9 +188,8 @@ 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_UV) && SMP
-       select IA64_UNCACHED_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
-       select GENERIC_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
+       depends on (IA64_SGI_UV || X86_UV) && SMP
+       depends on X86_64 || BROKEN
        select SGI_GRU if X86_64 && SMP
        ---help---
          An SGI machine can be divided into multiple Single System