From: Len Brown <len.brown@intel.com>
Date: Wed, 25 Jul 2007 05:36:31 +0000 (-0400)
Subject: Pull d-states into release branch
X-Git-Tag: MMI-PSA29.97-13-9~41147^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cb3e0c107bebc6cf3e7158f7aa54c32017c7d4c4;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Pull d-states into release branch

Conflicts:

	drivers/acpi/sleep/main.c

Signed-off-by: Len Brown <len.brown@intel.com>
---

cb3e0c107bebc6cf3e7158f7aa54c32017c7d4c4
diff --cc drivers/acpi/sleep/main.c
index 54c2dfcf8651,29bdb013f46c..ab21357c5c7b
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@@ -136,7 -152,8 +152,9 @@@ static int acpi_pm_finish(suspend_state
  	/* reset firmware waking vector */
  	acpi_set_firmware_waking_vector((acpi_physical_address) 0);
  
+ 	acpi_target_sleep_state = ACPI_STATE_S0;
+ 
 +#ifdef CONFIG_X86
  	if (init_8259A_after_S1) {
  		printk("Broken toshiba laptop -> kicking interrupts\n");
  		init_8259A(0);