Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 877e7909a0e55c34341f89ef0069be67922080fb..1d516f24ba53696336b483ab0bd859be836cbb37 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -2,11 +2,15 @@
 # Misc strange devices
 #
 
-menu "Misc devices"
+menuconfig MISC_DEVICES
+       bool "Misc devices"
+       default y
+
+if MISC_DEVICES
 
 config IBM_ASM
        tristate "Device driver for IBM RSA service processor"
-       depends on X86 && PCI && EXPERIMENTAL
+       depends on X86 && PCI && INPUT && EXPERIMENTAL
        ---help---
          This option enables device driver support for in-band access to the
          IBM RSA (Condor) service processor in eServer xSeries systems.
@@ -34,6 +38,11 @@ config PHANTOM
          If you choose to build module, its name will be phantom. If unsure,
          say N here.
 
+config EEPROM_93CX6
+       tristate "EEPROM 93CX6 support"
+       ---help---
+         This is a driver for the EEPROM chipsets 93c46 and 93c66.
+         The driver supports both read as well as write commands.
 
          If unsure, say N.
 
@@ -130,7 +139,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---
@@ -187,13 +196,4 @@ 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
+endif # MISC_DEVICES