diff options
| author | 2016-11-22 12:37:38 +0100 | |
|---|---|---|
| committer | 2016-11-22 12:37:38 +0100 | |
| commit | 02cb689b2c102178c83e763e4f34b3efe7f969e2 (patch) | |
| tree | cba7eb3f16487cef5dc4a2690686b1e2eb42af0c /arch/x86/include | |
| parent | sched/wake_q: Rename WAKE_Q to DEFINE_WAKE_Q (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security (diff) | |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/intel-mid.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/intel-mid.h b/arch/x86/include/asm/intel-mid.h index 5b6753d1f7f4..49da9f497b90 100644 --- a/arch/x86/include/asm/intel-mid.h +++ b/arch/x86/include/asm/intel-mid.h @@ -17,6 +17,7 @@ extern int intel_mid_pci_init(void); extern int intel_mid_pci_set_power_state(struct pci_dev *pdev, pci_power_t state); +extern pci_power_t intel_mid_pci_get_power_state(struct pci_dev *pdev); extern void intel_mid_pwr_power_off(void); |
