From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 25 Nov 2016 21:24:07 +0000 (+0100)
Subject: Merge branches 'acpi-sleep-fixes' and 'acpi-wdat-fixes'
X-Git-Tag: v4.9-rc7~13^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7e5c07af8693e72b23aefb70da88b31b30c35b22;p=karo-tx-linux.git

Merge branches 'acpi-sleep-fixes' and 'acpi-wdat-fixes'

* acpi-sleep-fixes:
  Revert "ACPI: Execute _PTS before system reboot"

* acpi-wdat-fixes:
  watchdog: wdat_wdt: Select WATCHDOG_CORE
---

7e5c07af8693e72b23aefb70da88b31b30c35b22
diff --cc drivers/watchdog/Kconfig
index fdd3228e0678,b4b3e256491b,616a0b2d7768..3eb58cb51e56
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@@@ -152,19 -153,6 -152,20 +152,20 @@@@ config TANGOX_WATCHDO
   
   	  This driver can be built as a module. The module name is tangox_wdt.
   
 + config WDAT_WDT
 + 	tristate "ACPI Watchdog Action Table (WDAT)"
 + 	depends on ACPI
++ 	select WATCHDOG_CORE
 + 	select ACPI_WATCHDOG
 + 	help
 + 	  This driver adds support for systems with ACPI Watchdog Action
 + 	  Table (WDAT) table. Servers typically have this but it can be
 + 	  found on some desktop machines as well. This driver will take
 + 	  over the native iTCO watchdog driver found on many Intel CPUs.
 + 
 + 	  To compile this driver as module, choose M here: the module will
 + 	  be called wdat_wdt.
 + 
   config WM831X_WATCHDOG
   	tristate "WM831x watchdog"
   	depends on MFD_WM831X