Commit 187dacce authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents 3c3ab37f ce29af2a

drivers/net/ethernet/intel/igb/igb_main.c

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/if.h>

#include <linux/if_vlan.h>

#include <linux/pci.h>

#include <linux/pci-aspm.h>

#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/ip.h>

drivers/net/wireless/ath/ath9k/pci.c

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


#include <linux/nl80211.h>

#include <linux/pci.h>

#include <linux/pci-aspm.h>

#include <linux/module.h>

#include "ath9k.h"

drivers/net/wireless/intel/iwlwifi/pcie/drv.c

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ 
#include <linux/module.h>

#include <linux/pm_runtime.h>

#include <linux/pci.h>

#include <linux/pci-aspm.h>

#include <linux/acpi.h>



#include "fw/acpi.h"

drivers/pci/pci-sysfs.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

drivers/pci/pci.c

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/string.h>

#include <linux/log2.h>

#include <linux/logic_pio.h>

#include <linux/pci-aspm.h>

#include <linux/pm_wakeup.h>

#include <linux/interrupt.h>

#include <linux/device.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE