From 30ee715524f489a1c4a708e2b76bb7cab9b92a80 Mon Sep 17 00:00:00 2001
From: Stefan Lippers-Hollmann <s.L-H@gmx.de>
Date: Tue, 15 Nov 2011 11:27:30 +0100
Subject: [PATCH] --- yaml --- r: 281052 b: refs/heads/master c:
 61fcc0166f8f004b36ac2ec239e43cfda7a62278 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/staging/rtl8192e/Makefile   | 2 --
 trunk/drivers/staging/rtl8192e/rtl_core.c | 2 --
 trunk/drivers/staging/rtl8192e/rtl_pm.c   | 2 --
 trunk/drivers/staging/rtl8192e/rtl_pm.h   | 4 ----
 5 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index cfd4dcde3aec..883ecef343aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71769d737a2887aa9608e89deaca4185e44a0bca
+refs/heads/master: 61fcc0166f8f004b36ac2ec239e43cfda7a62278
diff --git a/trunk/drivers/staging/rtl8192e/Makefile b/trunk/drivers/staging/rtl8192e/Makefile
index 299131c256e6..04714c4b8700 100644
--- a/trunk/drivers/staging/rtl8192e/Makefile
+++ b/trunk/drivers/staging/rtl8192e/Makefile
@@ -1,5 +1,3 @@
-ccflags-y += -DCONFIG_PM_RTL
-
 r8192e_pci-objs :=		\
 	rtl_core.o		\
 	rtl_eeprom.o		\
diff --git a/trunk/drivers/staging/rtl8192e/rtl_core.c b/trunk/drivers/staging/rtl8192e/rtl_core.c
index 4868091c3a42..b7c6d6b47173 100644
--- a/trunk/drivers/staging/rtl8192e/rtl_core.c
+++ b/trunk/drivers/staging/rtl8192e/rtl_core.c
@@ -53,9 +53,7 @@
 #include "rtl_wx.h"
 #include "rtl_dm.h"
 
-#ifdef CONFIG_PM_RTL
 #include "rtl_pm.h"
-#endif
 
 int hwwep = 1;
 static int channels = 0x3fff;
diff --git a/trunk/drivers/staging/rtl8192e/rtl_pm.c b/trunk/drivers/staging/rtl8192e/rtl_pm.c
index 92e2fde7f5f4..8e1a5d55dce8 100644
--- a/trunk/drivers/staging/rtl8192e/rtl_pm.c
+++ b/trunk/drivers/staging/rtl8192e/rtl_pm.c
@@ -17,7 +17,6 @@
  * wlanfae <wlanfae@realtek.com>
 ******************************************************************************/
 
-#ifdef CONFIG_PM_RTL
 #include "rtl_core.h"
 #include "r8192E_hw.h"
 #include "r8190P_rtl8256.h"
@@ -133,4 +132,3 @@ int rtl8192E_enable_wake(struct pci_dev *dev, pm_message_t state, int enable)
 	return -EAGAIN;
 }
 
-#endif
diff --git a/trunk/drivers/staging/rtl8192e/rtl_pm.h b/trunk/drivers/staging/rtl8192e/rtl_pm.h
index 4d7f4067cc78..e5299fc3b34a 100644
--- a/trunk/drivers/staging/rtl8192e/rtl_pm.h
+++ b/trunk/drivers/staging/rtl8192e/rtl_pm.h
@@ -17,8 +17,6 @@
  * wlanfae <wlanfae@realtek.com>
 ******************************************************************************/
 
-#ifdef CONFIG_PM_RTL
-
 #ifndef R8192E_PM_H
 #define R8192E_PM_H
 
@@ -31,5 +29,3 @@ int rtl8192E_resume(struct pci_dev *dev);
 int rtl8192E_enable_wake(struct pci_dev *dev, pm_message_t state, int enable);
 
 #endif
-
-#endif