diff options
| author | Yong Wang <yong.y.wang@linux.intel.com> | 2010-04-23 16:26:42 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 11:35:56 -0700 |
| commit | bebdf809eecd4da4b6c3d419c4ce0ccd17b2f90f (patch) | |
| tree | d5931f07e127744133e22fe1e9db34ddc445b9bd /drivers/staging/rtl8192e | |
| parent | 592ccfebb3d7ae6d2fa367b97f080790befa3c6c (diff) | |
Staging: rtl8192e: Use the standard config option for PM functions
Use the standard config option CONFIG_PM to enable rtl8192e PM
functions. Tested on Samsung N140 and it works fine. Without enabling
the PM functions, the box always fails to resume.
Signed-off-by: Yong Wang <yong.y.wang@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e')
| -rw-r--r-- | drivers/staging/rtl8192e/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/r8192E_core.c | 4 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/r8192_pm.c | 6 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/r8192_pm.h | 4 |
4 files changed, 5 insertions, 10 deletions
diff --git a/drivers/staging/rtl8192e/Makefile b/drivers/staging/rtl8192e/Makefile index e032c3e1e86..41cb4d3d626 100644 --- a/drivers/staging/rtl8192e/Makefile +++ b/drivers/staging/rtl8192e/Makefile @@ -18,6 +18,7 @@ r8192e_pci-objs := \ r819xE_firmware.o \ r819xE_cmdpkt.o \ r8192E_dm.o \ + r8192_pm.o \ ieee80211/ieee80211_rx.o \ ieee80211/ieee80211_softmac.o \ ieee80211/ieee80211_tx.o \ diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index 0b0506d2292..604c691d64b 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c @@ -62,7 +62,7 @@ //#include <linux/usb.h> // FIXME: check if 2.6.7 is ok -#ifdef CONFIG_PM_RTL +#ifdef CONFIG_PM #include "r8192_pm.h" #endif @@ -146,7 +146,7 @@ static struct pci_driver rtl8192_pci_driver = { .id_table = rtl8192_pci_id_tbl, /* PCI_ID table */ .probe = rtl8192_pci_probe, /* probe fn */ .remove = __devexit_p(rtl8192_pci_disconnect), /* remove fn */ -#ifdef CONFIG_PM_RTL +#ifdef CONFIG_PM .suspend = rtl8192E_suspend, /* PM suspend fn */ .resume = rtl8192E_resume, /* PM resume fn */ #else diff --git a/drivers/staging/rtl8192e/r8192_pm.c b/drivers/staging/rtl8192e/r8192_pm.c index feef29b0a89..521d49f8f8e 100644 --- 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 diff --git a/drivers/staging/rtl8192e/r8192_pm.h b/drivers/staging/rtl8192e/r8192_pm.h index 68d292b1d86..4da9b464b41 100644 --- a/drivers/staging/rtl8192e/r8192_pm.h +++ b/drivers/staging/rtl8192e/r8192_pm.h @@ -10,8 +10,6 @@ */ -#ifdef CONFIG_PM_RTL - #ifndef R8192E_PM_H #define R8192E_PM_H @@ -24,5 +22,3 @@ int rtl8192E_resume (struct pci_dev *dev); int rtl8192E_enable_wake (struct pci_dev *dev, pm_message_t state, int enable); #endif //R8192E_PM_H - -#endif // CONFIG_PM_RTL |