PCI: PCIe: Move PCIe PME code to the pcie directory

The PCIe PME code only consists of one file, so it doesn't need to occupy its own directory. Move it to drivers/pci/pcie/pme.c and remove the contents of drivers/pci/pcie/pme . Signed-off-by: Rafael J. Wysocki <[email protected]> Signed-off-by: Jesse Barnes <[email protected]>
mna · Aug 24, 2010 · 271fb71 · 271fb71
1 parent 2bd50dd
commit 271fb71
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/drivers/pci/pcie/Makefile b/drivers/pci/pcie/Makefile
@@ -13,4 +13,4 @@ obj-$(CONFIG_PCIEPORTBUS)	+= pcieportdrv.o
 # Build PCI Express AER if needed
 obj-$(CONFIG_PCIEAER)		+= aer/
 
-obj-$(CONFIG_PCIE_PME) += pme/
+obj-$(CONFIG_PCIE_PME) += pme.o
diff --git a/drivers/pci/pcie/pme/pcie_pme.c → drivers/pci/pcie/pme.c b/drivers/pci/pcie/pme/pcie_pme.c → drivers/pci/pcie/pme.c
@@ -23,8 +23,8 @@
 #include <linux/pci-acpi.h>
 #include <linux/pm_runtime.h>
 
-#include "../../pci.h"
-#include "../portdrv.h"
+#include "../pci.h"
+#include "portdrv.h"
 
 #define PCI_EXP_RTSTA_PME	0x10000 /* PME status */
 #define PCI_EXP_RTSTA_PENDING	0x20000 /* PME pending */

diff --git a/drivers/pci/pcie/pme/Makefile b/drivers/pci/pcie/pme/Makefile