summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2013-02-07 21:27:18 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-07 23:00:25 +0100
commitb95d788ac72b86515842a4eb92bb58a8da76a975 (patch)
tree459861562403ead0b3095e6f0dbb2c2bb711f33d /drivers/misc
parentmei: move clients cleanup code from init.c to client.c (diff)
downloadlinux-b95d788ac72b86515842a4eb92bb58a8da76a975.tar.xz
linux-b95d788ac72b86515842a4eb92bb58a8da76a975.zip
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>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/mei/Kconfig2
1 files changed, 1 insertions, 1 deletions
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.