mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge branch 'misc' into release
Conflicts: include/acpi/acpixf.h Signed-off-by: Len Brown <[email protected]>
This commit is contained in:
commit
d0302bc62a
9 changed files with 27 additions and 8 deletions
|
|
@ -65,6 +65,7 @@ EXPORT_SYMBOL(pm_idle);
|
|||
void (*pm_power_off) (void);
|
||||
EXPORT_SYMBOL(pm_power_off);
|
||||
|
||||
u32 acpi_rsdt_forced;
|
||||
unsigned int acpi_cpei_override;
|
||||
unsigned int acpi_cpei_phys_cpuid;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue