From 3299fa0b95533f7a945b28f62e0a46b36adc6f0d Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Sat, 21 Aug 2010 01:58:22 +0200
Subject: [PATCH] --- yaml --- r: 210334 b: refs/heads/master c:
 271fb719cc472af3b1e96d8c527bb0da7060a172 h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/pci/pcie/Makefile                  | 2 +-
 trunk/drivers/pci/pcie/{pme/pcie_pme.c => pme.c} | 4 ++--
 trunk/drivers/pci/pcie/pme/Makefile              | 5 -----
 4 files changed, 4 insertions(+), 9 deletions(-)
 rename trunk/drivers/pci/pcie/{pme/pcie_pme.c => pme.c} (99%)
 delete mode 100644 trunk/drivers/pci/pcie/pme/Makefile

diff --git a/[refs] b/[refs]
index 683b630a88ff..a0fbf2f8685a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bd50dd800b52245294cfceb56be62020cdc7515
+refs/heads/master: 271fb719cc472af3b1e96d8c527bb0da7060a172
diff --git a/trunk/drivers/pci/pcie/Makefile b/trunk/drivers/pci/pcie/Makefile
index 4d2b18704c47..00c62df5a9fc 100644
--- a/trunk/drivers/pci/pcie/Makefile
+++ b/trunk/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/trunk/drivers/pci/pcie/pme/pcie_pme.c b/trunk/drivers/pci/pcie/pme.c
similarity index 99%
rename from trunk/drivers/pci/pcie/pme/pcie_pme.c
rename to trunk/drivers/pci/pcie/pme.c
index 9d1361e1a776..2f3c90407227 100644
--- a/trunk/drivers/pci/pcie/pme/pcie_pme.c
+++ b/trunk/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/trunk/drivers/pci/pcie/pme/Makefile b/trunk/drivers/pci/pcie/pme/Makefile
deleted file mode 100644
index 3c67bf4d26cf..000000000000
--- a/trunk/drivers/pci/pcie/pme/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for PCI-Express Root Port PME signaling driver
-#
-
-obj-$(CONFIG_PCIE_PME) += pcie_pme.o