summaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei/Kconfig
diff options
context:
space:
mode:
authorAlexander Usyskin <alexander.usyskin@intel.com>2016-01-07 23:49:21 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-07 07:11:06 +0100
commitfdd9b8655933c3eb3154fe1ed351c17b654258bd (patch)
treefd8fe3dc39af6e46da838d9acdc395cce0420f1d /drivers/misc/mei/Kconfig
parentmei: drop nfc leftovers from the mei driver (diff)
downloadlinux-fdd9b8655933c3eb3154fe1ed351c17b654258bd.tar.xz
linux-fdd9b8655933c3eb3154fe1ed351c17b654258bd.zip
mei: wd: drop the watchdog code from the core mei driver
Instead of integrating the iAMT watchdog in the mei core driver we will create a watchdog device on the mei client bus and create a driver for it. This patch removes the watchdog code from the mei core driver. Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/Kconfig')
-rw-r--r--drivers/misc/mei/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/mei/Kconfig b/drivers/misc/mei/Kconfig
index d23384dde73b..c49e1d2269af 100644
--- a/drivers/misc/mei/Kconfig
+++ b/drivers/misc/mei/Kconfig
@@ -1,6 +1,6 @@
config INTEL_MEI
tristate "Intel Management Engine Interface"
- depends on X86 && PCI && WATCHDOG_CORE
+ depends on X86 && PCI
help
The Intel Management Engine (Intel ME) provides Manageability,
Security and Media services for system containing Intel chipsets.
@@ -12,7 +12,7 @@ config INTEL_MEI
config INTEL_MEI_ME
tristate "ME Enabled Intel Chipsets"
select INTEL_MEI
- depends on X86 && PCI && WATCHDOG_CORE
+ depends on X86 && PCI
help
MEI support for ME Enabled Intel chipsets.
@@ -37,7 +37,7 @@ config INTEL_MEI_ME
config INTEL_MEI_TXE
tristate "Intel Trusted Execution Environment with ME Interface"
select INTEL_MEI
- depends on X86 && PCI && WATCHDOG_CORE
+ depends on X86 && PCI
help
MEI Support for Trusted Execution Environment device on Intel SoCs