diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-13 02:29:06 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-13 02:29:06 +0300 |
| commit | f797484c26300fec842fb669c69a3a60eb66e240 (patch) | |
| tree | ebec99273a584e458832e258360a688616e7bad4 /arch/x86/platform/intel-mid/pwr.c | |
| parent | 991bc36254457f7f5695c0a28b39a91b104067a3 (diff) | |
| parent | 80e9a4f21fd7ccce7e9b8439986fd028c9946dda (diff) | |
| download | linux-f797484c26300fec842fb669c69a3a60eb66e240.tar.xz | |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform updates from Ingo Molnar:
"Two changes:
- implement various VMWare guest OS improvements/fixes (Alexey
Makhalov)
- unexport a spurious export from the intel-mid platform driver
(Lukas Wunner)"
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/vmware: Add paravirt sched clock
x86/vmware: Add basic paravirt ops support
x86/vmware: Use tsc_khz value for calibrate_cpu()
x86/platform/intel-mid: Unexport intel_mid_pci_set_power_state()
x86/vmware: Read tsc_khz only once at boot time
Diffstat (limited to 'arch/x86/platform/intel-mid/pwr.c')
| -rw-r--r-- | arch/x86/platform/intel-mid/pwr.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/platform/intel-mid/pwr.c b/arch/x86/platform/intel-mid/pwr.c index 67375dda451c..ef03852ea6e8 100644 --- a/arch/x86/platform/intel-mid/pwr.c +++ b/arch/x86/platform/intel-mid/pwr.c @@ -270,7 +270,6 @@ int intel_mid_pci_set_power_state(struct pci_dev *pdev, pci_power_t state) return 0; } -EXPORT_SYMBOL_GPL(intel_mid_pci_set_power_state); pci_power_t intel_mid_pci_get_power_state(struct pci_dev *pdev) { |