xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'linus' into release

Browse Source 
Conflicts:
	arch/x86/kernel/acpi/sleep.c

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown
2011-03-23 02:34:54 -04:00
parent 96e1c408ea 6447f55da9
commit 02e2407858
6711 changed files with 447087 additions and 222007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/acpi/sleep.c
View File

@@ -16,6 +16,7 @@
#include <linux/device.h>
#include <linux/suspend.h>
#include <linux/reboot.h>
#include <linux/acpi.h>
#include <asm/io.h>
@@ -567,7 +568,7 @@ int acpi_suspend(u32 acpi_state)
return -EINVAL;
}
#ifdef CONFIG_PM_OPS
#ifdef CONFIG_PM
/**
* acpi_pm_device_sleep_state - return preferred power state of ACPI device
* in the system sleep state given by %acpi_target_sleep_state
@@ -653,7 +654,7 @@ int acpi_pm_device_sleep_state(struct device *dev, int *d_min_p)
*d_min_p = d_min;
return d_max;
}
#endif /* CONFIG_PM_OPS */
#endif /* CONFIG_PM */
#ifdef CONFIG_PM_SLEEP
/**