From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 15 Aug 2018 19:58:46 +0000 (-0500)
Subject: Merge branch 'pci/aspm'
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~4748^2~19
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=187dacce194216c4d86c2afd0ca490a6d7fbb981;p=mirror_ubuntu-focal-kernel.git

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
---

187dacce194216c4d86c2afd0ca490a6d7fbb981