fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 88c103e..1429f3a 100644 (file)
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -1,15 +1,33 @@
 menu "Generic Driver Options"
 
+config STANDALONE
+       bool "Select only drivers that don't need compile-time external firmware" if EXPERIMENTAL
+       default y
+       help
+         Select this option if you don't have magic firmware for drivers that
+         need it.
+
+         If unsure, say Y.
+
+config PREVENT_FIRMWARE_BUILD
+       bool "Prevent firmware from being built"
+       default y
+       help
+         Say yes to avoid building firmware. Firmware is usually shipped
+         with the driver, and only when updating the firmware a rebuild
+         should be made.
+         If unsure say Y here.
+
 config FW_LOADER
-       tristate "Hotplug firmware loading support"
+       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
-        bool "Driver Core verbose debug messages"
+       bool "Driver Core verbose debug messages"
        depends on DEBUG_KERNEL
        help
          Say Y here if you want the Driver core to produce a bunch of
@@ -19,4 +37,8 @@ config DEBUG_DRIVER
 
          If you are unsure about this, say N here.
 
+config SYS_HYPERVISOR
+       bool
+       default n
+
 endmenu