---

yaml --- r: 268313 b: refs/heads/master c: cf05e52 h: refs/heads/master i: 268311: c79fc23 v: v3
git-mirror · Sep 9, 2011 · 9f20363 · 9f20363
1 parent bada666
commit 9f20363
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: d8deca315b99fca4f4c9ba559468145e52109ecc
+refs/heads/master: cf05e52b026fcfb76e846596bd8e1c3f3e9420ea
diff --git a/trunk/drivers/staging/mei/Kconfig b/trunk/drivers/staging/mei/Kconfig
@@ -1,6 +1,6 @@
 config INTEL_MEI
 	tristate "Intel Management Engine Interface (Intel MEI)"
-	depends on X86 && PCI && EXPERIMENTAL
+	depends on X86 && PCI && EXPERIMENTAL && WATCHDOG_CORE
 	help
 	  The Intel Management Engine (Intel ME) provides Manageability,
 	  Security and Media services for system containing Intel chipsets.