Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-2.6] / drivers / char / Kconfig

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 0e6f35f..2af12fc 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -409,14 +409,6 @@ config SGI_MBCS
          If you have an SGI Altix with an attached SABrick
          say Y or M here, otherwise say N.
 
-config MSPEC
-       tristate "Memory special operations driver"
-       depends on IA64
-       help
-         If you have an ia64 and you want to enable memory special
-         operations support (formerly known as fetchop), say Y here,
-         otherwise say N.
-
 source "drivers/serial/Kconfig"
 
 config UNIX98_PTYS
@@ -1046,7 +1038,7 @@ source "drivers/char/tpm/Kconfig"
 
 config TELCLOCK
        tristate "Telecom clock driver for MPBL0010 ATCA SBC"
-       depends on EXPERIMENTAL
+       depends on EXPERIMENTAL && X86
        default n
        help
          The telecom clock device is specific to the MPBL0010 ATCA computer and