Merge tag 'lsk-v3.10-android-15.02'

[firefly-linux-kernel-4.4.55.git] / drivers / misc / mei / Kconfig

diff --git a/drivers/misc/mei/Kconfig b/drivers/misc/mei/Kconfig
index d21b4d006a5519c7a658558a115b8044d5c7b2d0..c76fa31e9bf6926aac9cc181846d383f1325c8da 100644 (file)
--- a/drivers/misc/mei/Kconfig
+++ b/drivers/misc/mei/Kconfig
@@ -10,10 +10,9 @@ config INTEL_MEI
          <http://software.intel.com/en-us/manageability/>
 
 config INTEL_MEI_ME
-       bool "ME Enabled Intel Chipsets"
-       depends on INTEL_MEI
+       tristate "ME Enabled Intel Chipsets"
+       select INTEL_MEI
        depends on X86 && PCI && WATCHDOG_CORE
-       default y
        help
          MEI support for ME Enabled Intel chipsets.