Pull battery into release branch

[linux-2.6-omap-h63xx.git] / drivers / firmware / Kconfig

diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 327b58e648753013e28026f4fb9f66f4af89edfe..05f02a326f1c6283277964f307873df9cb5a5489 100644 (file)
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -6,8 +6,7 @@
 menu "Firmware Drivers"
 
 config EDD
-       tristate "BIOS Enhanced Disk Drive calls determine boot disk (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       tristate "BIOS Enhanced Disk Drive calls determine boot disk"
        depends on !IA64
        help
          Say Y or M here if you want to enable BIOS Enhanced Disk Drive
@@ -60,18 +59,18 @@ config EFI_PCDP
 
 config DELL_RBU
        tristate "BIOS update support for DELL systems via sysfs"
+       depends on X86
        select FW_LOADER
        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.
 
 config DCDBAS
        tristate "Dell Systems Management Base Driver"
-       depends on X86 || X86_64
-       default m
+       depends on X86
        help
          The Dell Systems Management Base Driver provides a sysfs interface
          for systems management software to perform System Management
@@ -85,4 +84,13 @@ 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.
+
 endmenu