rtl8192e: drop alternate code paths for CONFIG_PM_RTL
authorStefan Lippers-Hollmann <s.L-H@gmx.de>
Tue, 15 Nov 2011 10:27:30 +0000 (11:27 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sun, 27 Nov 2011 01:19:24 +0000 (17:19 -0800)
It has always been enabled unconditionally by ccflags-y.

Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/rtl8192e/Makefile
drivers/staging/rtl8192e/rtl_core.c
drivers/staging/rtl8192e/rtl_pm.c
drivers/staging/rtl8192e/rtl_pm.h

index 299131c256e67fa7a8dfa2be406f688efaa5de02..04714c4b870052503ba2ff14c072ea16ec5fa252 100644 (file)
@@ -1,5 +1,3 @@
-ccflags-y += -DCONFIG_PM_RTL
-
 r8192e_pci-objs :=             \
        rtl_core.o              \
        rtl_eeprom.o            \
index 4868091c3a422c1e421a232376ba3b0c900df638..b7c6d6b4717303e3f01793707673637716f1c906 100644 (file)
@@ -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;
index 92e2fde7f5f400773c47cc0a9e70db17924eb4bb..8e1a5d55dce88bb454c784e94d6891428e75ebde 100644 (file)
@@ -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
index 4d7f4067cc78ffbe0ace92096b5143579d2a4099..e5299fc3b34a87a05108ece9e997d094bd1ebe06 100644 (file)
@@ -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