Merge firewire branches to be released post v2.6.35

[mv-sheeva.git] / drivers / staging / rtl8192e / r8192_pm.c

diff --git a/drivers/staging/rtl8192e/r8192_pm.c b/drivers/staging/rtl8192e/r8192_pm.c
index feef29b0a8939335966a62f166b5acd6c89aad3f..521d49f8f8ea03f1c5ebc179c9fb8e33d36f5bb5 100644 (file)
--- a/drivers/staging/rtl8192e/r8192_pm.c
+++ b/drivers/staging/rtl8192e/r8192_pm.c
@@ -9,8 +9,6 @@
    Released under the terms of GPL (General Public Licence)
 */
 
-#ifdef CONFIG_PM_RTL
-
 #include "r8192E.h"
 #include "r8192E_hw.h"
 #include "r8192_pm.h"
@@ -27,7 +25,9 @@ int rtl8192E_suspend (struct pci_dev *pdev, pm_message_t state)
 {
        struct net_device *dev = pci_get_drvdata(pdev);
        struct r8192_priv *priv = ieee80211_priv(dev);
+#ifdef RTL8190P
        u8      ucRegRead;
+#endif
        u32     ulRegRead;
 
         RT_TRACE(COMP_POWER, "============> r8192E suspend call.\n");
@@ -168,5 +168,3 @@ int rtl8192E_enable_wake (struct pci_dev *dev, pm_message_t state, int enable)
               state.event, enable);
        return(-EAGAIN);
 }
-
-#endif //CONFIG_PM_RTL