Merge tag 'iommu-updates-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/joro...

[~andy/linux] / drivers / misc / mei / Kconfig

diff --git a/drivers/misc/mei/Kconfig b/drivers/misc/mei/Kconfig
index 5a79ccde2fdf6ea5c93ba54f491d053fd18c5581..d21b4d006a5519c7a658558a115b8044d5c7b2d0 100644 (file)
--- a/drivers/misc/mei/Kconfig
+++ b/drivers/misc/mei/Kconfig
@@ -1,11 +1,22 @@
 config INTEL_MEI
-       tristate "Intel Management Engine Interface (Intel MEI)"
+       tristate "Intel Management Engine Interface"
        depends on X86 && PCI && WATCHDOG_CORE
        help
          The Intel Management Engine (Intel ME) provides Manageability,
          Security and Media services for system containing Intel chipsets.
          if selected /dev/mei misc device will be created.
 
+         For more information see
+         <http://software.intel.com/en-us/manageability/>
+
+config INTEL_MEI_ME
+       bool "ME Enabled Intel Chipsets"
+       depends on INTEL_MEI
+       depends on X86 && PCI && WATCHDOG_CORE
+       default y
+       help
+         MEI support for ME Enabled Intel chipsets.
+
          Supported Chipsets are:
          7 Series Chipset Family
          6 Series Chipset Family
@@ -24,5 +35,3 @@ config INTEL_MEI
          82Q33 Express
          82X38/X48 Express
 
-         For more information see
-         <http://software.intel.com/en-us/manageability/>