mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge branches 'release', 'bugzilla-9916', 'bugzilla-9982', 'bugzilla-9989', 'misc', 'suspend', 'thermal', 'thinkpad' and 'tsc' into release
This commit is contained in:
commit
1f1519ef59
684 changed files with 20693 additions and 10625 deletions
|
|
@ -158,6 +158,7 @@ run_osc_out:
|
|||
/**
|
||||
* __pci_osc_support_set - register OS support to Firmware
|
||||
* @flags: OS support bits
|
||||
* @hid: hardware ID
|
||||
*
|
||||
* Update OS support fields and doing a _OSC Query to obtain an update
|
||||
* from Firmware on supported control bits.
|
||||
|
|
@ -241,8 +242,6 @@ EXPORT_SYMBOL(pci_osc_control_set);
|
|||
* choose from highest power _SxD to lowest power _SxW
|
||||
* else // no _PRW at S-state x
|
||||
* choose highest power _SxD or any lower power
|
||||
*
|
||||
* currently we simply return _SxD, if present.
|
||||
*/
|
||||
|
||||
static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev,
|
||||
|
|
|
|||
Loading…
Reference in a new issue