---

yaml --- r: 355063 b: refs/heads/master c: b95d788 h: refs/heads/master i: 355061: 348dfe6 355059: b34097e 355055: a26a6bf v: v3
git-mirror · Feb 7, 2013 · 042dcc3 · 042dcc3
1 parent 512b953
commit 042dcc3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 074b4c01abb68c6767612a01f41e9b4ed93d5fb8
+refs/heads/master: b95d788ac72b86515842a4eb92bb58a8da76a975
diff --git a/trunk/drivers/misc/mei/Kconfig b/trunk/drivers/misc/mei/Kconfig
@@ -1,6 +1,6 @@
 config INTEL_MEI
 	tristate "Intel Management Engine Interface"
-	depends on X86 && PCI
+	depends on X86 && PCI && WATCHDOG_CORE
 	help
 	  The Intel Management Engine (Intel ME) provides Manageability,
 	  Security and Media services for system containing Intel chipsets.