Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[pandora-kernel.git] / drivers / char / Kconfig

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 7f0d323..1b21c3a 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -439,6 +439,14 @@ config SGI_MBCS
          If you have an SGI Altix with an attached SABrick
          say Y or M here, otherwise say N.
 
          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
 source "drivers/serial/Kconfig"
 
 config UNIX98_PTYS