Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak...

[sfrench/cifs-2.6.git] / drivers / firmware / Kconfig

diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 731c3d5da0dc7c6bc66a33a705f9b7a2fceab90a..40ffd767647d623baa1259618b8912ef8ecc863d 100644 (file)
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -64,7 +64,7 @@ config DELL_RBU
        help
         Say m if you want to have the option of updating the BIOS for your
         DELL system. Note you need a Dell OpenManage or Dell Update package (DUP)
-        supporting application to comunicate with the BIOS regarding the new
+        supporting application to communicate with the BIOS regarding the new
         image for the image update to take effect.
         See <file:Documentation/dell_rbu.txt> for more details on the driver.
 
@@ -84,4 +84,33 @@ config DCDBAS
          Say Y or M here to enable the driver for use by Dell systems
          management software such as Dell OpenManage.
 
+config DMIID
+    bool "Export DMI identification via sysfs to userspace"
+    depends on DMI
+    default y
+       help
+         Say Y here if you want to query SMBIOS/DMI system identification
+         information from userspace through /sys/class/dmi/id/ or if you want
+         DMI-based module auto-loading.
+
+config ISCSI_IBFT_FIND
+       bool "iSCSI Boot Firmware Table Attributes"
+       depends on X86
+       default n
+       help
+         This option enables the kernel to find the region of memory
+         in which the ISCSI Boot Firmware Table (iBFT) resides. This
+         is necessary for iSCSI Boot Firmware Table Attributes module to work
+         properly.
+
+config ISCSI_IBFT
+       tristate "iSCSI Boot Firmware Table Attributes module"
+       depends on ISCSI_IBFT_FIND
+       default n
+       help
+         This option enables support for detection and exposing of iSCSI
+         Boot Firmware Table (iBFT) via sysfs to userspace. If you wish to
+         detect iSCSI boot parameters dynamically during system boot, say Y.
+         Otherwise, say N.
+
 endmenu