Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index a3c525b2616aafeaa855b03377e0f4ee4937cdc5..2f2fbffafbe052799e2315737b0e9e08225fd8ff 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -25,6 +25,15 @@ config IBM_ASM
          information on the specific driver level and support statement
          for your IBM server.
 
+config PHANTOM
+       tristate "Sensable PHANToM"
+       depends on PCI
+       help
+         Say Y here if you want to build a driver for Sensable PHANToM device.
+
+         If you choose to build module, its name will be phantom. If unsure,
+         say N here.
+
 
          If unsure, say N.
 
@@ -121,7 +130,7 @@ config SONY_LAPTOP
 
          Read <file:Documentation/sony-laptop.txt> for more information.
 
-config SONY_LAPTOP_OLD
+config SONYPI_COMPAT
        bool "Sonypi compatibility"
        depends on SONY_LAPTOP
          ---help---
@@ -178,4 +187,13 @@ config THINKPAD_ACPI_BAY
 
          If you are not sure, say Y here.
 
+config BLINK
+       tristate "Keyboard blink driver"
+       help
+         Driver that when loaded will blink the keyboard LEDs continuously.
+         This is useful for debugging and for kernels that cannot necessarily
+         output something to the screen like kexec kernels to give the user
+         a visual indication that the kernel is doing something.
+
+
 endmenu