diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2019-09-23 16:10:06 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-09-23 16:10:06 -0500 |
| commit | 20d3618b25c7e83136f6ff123e59c88230f9cb17 (patch) | |
| tree | b22b0ca582ae8f912454e91cc976541feae9ca3a /drivers/pci | |
| parent | Linus 5.3-rc1 (diff) | |
| parent | PCI: Move ASPM declarations to linux/pci.h (diff) | |
| download | linux-dev-20d3618b25c7e83136f6ff123e59c88230f9cb17.tar.xz linux-dev-20d3618b25c7e83136f6ff123e59c88230f9cb17.zip | |
Merge branch 'pci/aspm'
- Consolidate ASPM interfaces in linux/pci.h (Krzysztof Wilczynski)
* pci/aspm:
PCI: Move ASPM declarations to linux/pci.h
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci-acpi.c | 1 | ||||
| -rw-r--r-- | drivers/pci/pcie/aspm.c | 1 | ||||
| -rw-r--r-- | drivers/pci/quirks.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index 45049f558860..dd520fe927db 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -14,7 +14,6 @@ #include <linux/msi.h> #include <linux/pci_hotplug.h> #include <linux/module.h> -#include <linux/pci-aspm.h> #include <linux/pci-acpi.h> #include <linux/pm_runtime.h> #include <linux/pm_qos.h> diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index e44af7f4d37f..ad6259ec51a6 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -18,7 +18,6 @@ #include <linux/slab.h> #include <linux/jiffies.h> #include <linux/delay.h> -#include <linux/pci-aspm.h> #include "../pci.h" #ifdef MODULE_PARAM_PREFIX diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 208aacf39329..9ac1a7564c9e 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -20,7 +20,6 @@ #include <linux/delay.h> #include <linux/acpi.h> #include <linux/dmi.h> -#include <linux/pci-aspm.h> #include <linux/ioport.h> #include <linux/sched.h> #include <linux/ktime.h> |