summaryrefslogtreecommitdiffstats
path: root/drivers/pci/probe.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2018-08-15 14:58:46 -0500
committerBjorn Helgaas <bhelgaas@google.com>2018-08-15 14:58:46 -0500
commit187dacce194216c4d86c2afd0ca490a6d7fbb981 (patch)
tree297a6df9c6e4744fe8f3f0092081f5994e667da8 /drivers/pci/probe.c
parent3c3ab37f4c03dc9c7c917ff3c1e71d6da81d3bd3 (diff)
parentce29af2a505627cc8f1deddb84bcbaf186b0bfd5 (diff)
downloadlinux-187dacce194216c4d86c2afd0ca490a6d7fbb981.tar.bz2
Merge branch 'pci/aspm'
- Use sysfs_match_string() to simplify ASPM sysfs parsing (Andy Shevchenko) - Remove unnecessary includes of <linux/pci-aspm.h> (Bjorn Helgaas) * pci/aspm: PCI: Remove unnecessary include of <linux/pci-aspm.h> iwlwifi: Remove unnecessary include of <linux/pci-aspm.h> ath9k: Remove unnecessary include of <linux/pci-aspm.h> igb: Remove unnecessary include of <linux/pci-aspm.h> PCI/ASPM: Convert to use sysfs_match_string() helper
Diffstat (limited to 'drivers/pci/probe.c')
-rw-r--r--drivers/pci/probe.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 9472da27e202..155d4333a291 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -13,7 +13,6 @@
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/cpumask.h>
-#include <linux/pci-aspm.h>
#include <linux/aer.h>
#include <linux/acpi.h>
#include <linux/hypervisor.h>