From: Tomas Winkler <tomas.winkler@intel.com>
Date: Thu, 7 Feb 2013 20:27:18 +0000 (+0200)
Subject: mei: fix undefined wd symbols when MEI_ME is not set
X-Git-Tag: firefly_0821_release~3680^2~1077^2~14
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b95d788ac72b86515842a4eb92bb58a8da76a975;p=firefly-linux-kernel-4.4.55.git

mei: fix undefined wd symbols when MEI_ME is not set

Currently watchdog client is compiled with MEI and not
with MEI_ME

Fixes error:
When CONFIG_WATCHDOG is not enabled:

ERROR: "watchdog_unregister_device" [drivers/misc/mei/mei.ko] undefined!
ERROR: "watchdog_register_device" [drivers/misc/mei/mei.ko] undefined

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/misc/mei/Kconfig b/drivers/misc/mei/Kconfig
index fa5c24982c88..d21b4d006a55 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
+	depends on X86 && PCI && WATCHDOG_CORE
 	help
 	  The Intel Management Engine (Intel ME) provides Manageability,
 	  Security and Media services for system containing Intel chipsets.