Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

[linux-2.6] / drivers / base / Kconfig

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 80502dc6ed668dbee5bc388520e1a819d8449959..1429f3a2629e60003e575bb02c5dd6fe97470e3c 100644 (file)
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -20,7 +20,7 @@ config PREVENT_FIRMWARE_BUILD
 
 config FW_LOADER
        tristate "Userspace firmware loading support"
-       select HOTPLUG
+       depends on HOTPLUG
        ---help---
          This option is provided for the case where no in-kernel-tree modules
          require userspace firmware loading support, but a module built outside
@@ -37,8 +37,8 @@ config DEBUG_DRIVER
 
          If you are unsure about this, say N here.
 
-endmenu
-
 config SYS_HYPERVISOR
        bool
        default n
+
+endmenu