Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / drivers / base / Kconfig

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 13cfcb435f7d3e988cf792e106d8cd8cd0693e21..6318f6b573608f345129234abf85c2629f6df4a1 100644 (file)
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -27,13 +27,39 @@ config PREVENT_FIRMWARE_BUILD
          If unsure say Y here.
 
 config FW_LOADER
-       tristate "Userspace firmware loading support"
+       tristate "Userspace firmware loading support" if EMBEDDED
        depends on HOTPLUG
+       default y
        ---help---
          This option is provided for the case where no in-kernel-tree modules
          require userspace firmware loading support, but a module built outside
          the kernel tree does.
 
+config FIRMWARE_IN_KERNEL
+       bool "Include in-kernel firmware blobs in kernel binary"
+       depends on FW_LOADER
+       default y
+       help
+         The kernel source tree includes a number of firmware 'blobs'
+         which are used by various drivers. The recommended way to
+         use these is to run "make firmware_install" and to copy the
+         resulting binary files created in usr/lib/firmware directory
+         of the kernel tree to the /lib/firmware on your system so
+         that they can be loaded by userspace helpers on request.
+
+         Enabling this option will build each required firmware blob
+         into the kernel directly, where request_firmware() will find
+         them without having to call out to userspace. This may be
+         useful if your root file system requires a device which uses
+         such firmware, and do not wish to use an initrd.
+
+         This single option controls the inclusion of firmware for
+         every driver which usees request_firmare() and ships its
+         firmware in the kernel source tree, to avoid a proliferation
+         of 'Include firmware for xxx device' options.
+
+         Say 'N' and let firmware be loaded from userspace.
+
 config EXTRA_FIRMWARE
        string "External firmware blobs to build into the kernel binary"
        depends on FW_LOADER