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 bd601efa7bd188b77a3ced5e24a4f7684684a76a..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.
@@ -192,4 +196,4 @@ config THINKPAD_ACPI_BAY
 
          If you are not sure, say Y here.
 
-endmenu
+endif # MISC_DEVICES