Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20d3618b authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/aspm' 

  - Consolidate ASPM interfaces in linux/pci.h (Krzysztof Wilczynski)

* pci/aspm:
  PCI: Move ASPM declarations to linux/pci.h
parents 5f9e832c 7ce2e76a

drivers/acpi/pci_root.c

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

#include <linux/pci.h>

#include <linux/pci-acpi.h>

#include <linux/pci-aspm.h>

#include <linux/dmar.h>

#include <linux/acpi.h>

#include <linux/slab.h>

drivers/char/xillybus/xillybus_pcie.c

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


#include <linux/module.h>

#include <linux/pci.h>

#include <linux/pci-aspm.h>

#include <linux/slab.h>

#include "xillybus.h"

drivers/net/ethernet/intel/e1000e/e1000.h

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

#include <linux/netdevice.h>

#include <linux/pci.h>

#include <linux/pci-aspm.h>

#include <linux/crc32.h>

#include <linux/if_vlan.h>

#include <linux/timecounter.h>

drivers/net/ethernet/jme.c

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

#include <linux/kernel.h>

#include <linux/pci.h>

#include <linux/pci-aspm.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>

#include <linux/ethtool.h>

drivers/net/ethernet/realtek/r8169_main.c

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

#include <linux/pm_runtime.h>

#include <linux/prefetch.h>

#include <linux/pci-aspm.h>

#include <linux/ipv6.h>

#include <net/ip6_checksum.h>