Add changes from the Linux-2.6 tree.

[linux-2.6.git] / drivers / base / Kconfig

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