2 files changed, 7 insertions, 23 deletions

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index deb0ff78eba8..54abb26b7366 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -47,32 +47,15 @@ static void acpi_sleep_tts_switch(u32 acpi_state)
         }
 }
 
-static void acpi_sleep_pts_switch(u32 acpi_state)
-{
-        acpi_status status;
-
-        status = acpi_execute_simple_method(NULL, "\\_PTS", acpi_state);
-        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-                /*
-                 * OS can't evaluate the _PTS object correctly. Some warning
-                 * message will be printed. But it won't break anything.
-                 */
-                printk(KERN_NOTICE "Failure in evaluating _PTS object\n");
-        }
-}
-
-static int sleep_notify_reboot(struct notifier_block *this,
+static int tts_notify_reboot(struct notifier_block *this,
                         unsigned long code, void *x)
 {
         acpi_sleep_tts_switch(ACPI_STATE_S5);
-
-        acpi_sleep_pts_switch(ACPI_STATE_S5);
-
         return NOTIFY_DONE;
 }
 
-static struct notifier_block sleep_notifier = {
-        .notifier_call  = sleep_notify_reboot,
+static struct notifier_block tts_notifier = {
+        .notifier_call  = tts_notify_reboot,
         .next           = NULL,
         .priority       = 0,
 };
@@ -916,9 +899,9 @@ int __init acpi_sleep_init(void)
         pr_info(PREFIX "(supports%s)\n", supported);
 
         /*
-         * Register the sleep_notifier to reboot notifier list so that the _TTS
-         * and _PTS object can also be evaluated when the system enters S5.
+         * Register the tts_notifier to reboot notifier list so that the _TTS
+         * object can also be evaluated when the system enters S5.
          */
-        register_reboot_notifier(&sleep_notifier);
+        register_reboot_notifier(&tts_notifier);
         return 0;
 }
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index fdd3228e0678..3eb58cb51e56 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -155,6 +155,7 @@ config TANGOX_WATCHDOG
 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