ACPICA 20050617-0624 from Bob Moore <robert.moore@intel.com>

[linux-2.6] / drivers / acpi / hardware / hwsleep.c

diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index 415d342aeab5cf41661ac5b38e9513757940ca7d..cedee0c43b5fe278028a24485a029c86417bfd88 100644 (file)
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -274,13 +274,13 @@ acpi_enter_sleep_state (
         * 1) Disable/Clear all GPEs
         * 2) Enable all wakeup GPEs
         */
-       status = acpi_hw_disable_all_gpes (ACPI_ISR);
+       status = acpi_hw_disable_all_gpes ();
        if (ACPI_FAILURE (status)) {
                return_ACPI_STATUS (status);
        }
        acpi_gbl_system_awake_and_running = FALSE;
 
-       status = acpi_hw_enable_all_wakeup_gpes (ACPI_ISR);
+       status = acpi_hw_enable_all_wakeup_gpes ();
        if (ACPI_FAILURE (status)) {
                return_ACPI_STATUS (status);
        }
@@ -424,13 +424,13 @@ acpi_enter_sleep_state_s4bios (
         * 1) Disable/Clear all GPEs
         * 2) Enable all wakeup GPEs
         */
-       status = acpi_hw_disable_all_gpes (ACPI_ISR);
+       status = acpi_hw_disable_all_gpes ();
        if (ACPI_FAILURE (status)) {
                return_ACPI_STATUS (status);
        }
        acpi_gbl_system_awake_and_running = FALSE;
 
-       status = acpi_hw_enable_all_wakeup_gpes (ACPI_ISR);
+       status = acpi_hw_enable_all_wakeup_gpes ();
        if (ACPI_FAILURE (status)) {
                return_ACPI_STATUS (status);
        }
@@ -557,13 +557,13 @@ acpi_leave_sleep_state (
         * 1) Disable/Clear all GPEs
         * 2) Enable all runtime GPEs
         */
-       status = acpi_hw_disable_all_gpes (ACPI_NOT_ISR);
+       status = acpi_hw_disable_all_gpes ();
        if (ACPI_FAILURE (status)) {
                return_ACPI_STATUS (status);
        }
        acpi_gbl_system_awake_and_running = TRUE;
 
-       status = acpi_hw_enable_all_runtime_gpes (ACPI_NOT_ISR);
+       status = acpi_hw_enable_all_runtime_gpes ();
        if (ACPI_FAILURE (status)) {
                return_ACPI_STATUS (status);
        }