Merge branch 'suspend' into release

[safe/jmp/linux-2.6] / drivers / acpi / main.c

diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/main.c
similarity index 98%
rename from drivers/acpi/sleep/main.c
rename to drivers/acpi/main.c
index bef41fd..7e3c609 100644 (file)
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/main.c
@@ -120,7 +120,7 @@ void __init acpi_s4_no_nvs(void)
  */
 static int acpi_pm_disable_gpes(void)
 {
-       acpi_hw_disable_all_gpes();
+       acpi_disable_all_gpes();
        return 0;
 }
 
@@ -148,7 +148,7 @@ static int acpi_pm_prepare(void)
        int error = __acpi_pm_prepare();
 
        if (!error)
-               acpi_hw_disable_all_gpes();
+               acpi_disable_all_gpes();
        return error;
 }
 
@@ -280,7 +280,7 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
         * (like wakeup GPE) haven't handler, this can avoid such GPE misfire.
         * acpi_leave_sleep_state will reenable specific GPEs later
         */
-       acpi_hw_disable_all_gpes();
+       acpi_disable_all_gpes();
 
        local_irq_restore(flags);
        printk(KERN_DEBUG "Back to C!\n");
@@ -473,7 +473,7 @@ static void acpi_hibernation_leave(void)
 
 static void acpi_pm_enable_gpes(void)
 {
-       acpi_hw_enable_all_runtime_gpes();
+       acpi_enable_all_runtime_gpes();
 }
 
 static struct platform_hibernation_ops acpi_hibernation_ops = {
@@ -673,7 +673,7 @@ static void acpi_power_off_prepare(void)
 {
        /* Prepare to power off the system */
        acpi_sleep_prepare(ACPI_STATE_S5);
-       acpi_hw_disable_all_gpes();
+       acpi_disable_all_gpes();
 }
 
 static void acpi_power_off(void)
@@ -722,7 +722,7 @@ int __init acpi_sleep_init(void)
                sleep_states[ACPI_STATE_S4] = 1;
                printk(" S4");
                if (!nosigcheck) {
-                       acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
+                       acpi_get_table(ACPI_SIG_FACS, 1,
                                (struct acpi_table_header **)&facs);
                        if (facs)
                                s4_hardware_signature =