1 files changed, 2 insertions, 12 deletions

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 721e949e606e..b718806657cd 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -18,12 +18,8 @@
 #include <linux/reboot.h>
 #include <linux/acpi.h>
 #include <linux/module.h>
-
 #include <asm/io.h>
 
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
-
 #include "internal.h"
 #include "sleep.h"
 
@@ -670,11 +666,8 @@ static void acpi_hibernation_leave(void)
         /* Reprogram control registers */
         acpi_leave_sleep_state_prep(ACPI_STATE_S4);
         /* Check the hardware signature */
-        if (facs && s4_hardware_signature != facs->hardware_signature) {
-                printk(KERN_EMERG "ACPI: Hardware changed while hibernated, "
-                        "cannot resume!\n");
-                panic("ACPI S4 hardware signature mismatch");
-        }
+        if (facs && s4_hardware_signature != facs->hardware_signature)
+                pr_crit("ACPI: Hardware changed while hibernated, success doubtful!\n");
         /* Restore the NVS memory area */
         suspend_nvs_restore();
         /* Allow EC transactions to happen. */
@@ -806,9 +799,6 @@ int __init acpi_sleep_init(void)
         char *pos = supported;
         int i;
 
-        if (acpi_disabled)
-                return 0;
-
         acpi_sleep_dmi_check();
 
         sleep_states[ACPI_STATE_S0] = 1;