summaryrefslogtreecommitdiff
path: root/drivers/pci/pci-sysfs.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2018-08-15 22:58:46 +0300
committerBjorn Helgaas <bhelgaas@google.com>2018-08-15 22:58:46 +0300
commit187dacce194216c4d86c2afd0ca490a6d7fbb981 (patch)
tree297a6df9c6e4744fe8f3f0092081f5994e667da8 /drivers/pci/pci-sysfs.c
parent3c3ab37f4c03dc9c7c917ff3c1e71d6da81d3bd3 (diff)
parentce29af2a505627cc8f1deddb84bcbaf186b0bfd5 (diff)
downloadlinux-187dacce194216c4d86c2afd0ca490a6d7fbb981.tar.xz
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/pci-sysfs.c')
-rw-r--r--drivers/pci/pci-sysfs.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 9f1cb9051d7d..32589f5552b2 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -23,7 +23,6 @@
#include <linux/fs.h>
#include <linux/capability.h>
#include <linux/security.h>
-#include <linux/pci-aspm.h>
#include <linux/slab.h>
#include <linux/vgaarb.h>
#include <linux/pm_runtime.h>