diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-03 19:52:23 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-03 19:52:23 +1000 |
| commit | 29bb0900c4032a1317f07e7bb1b28c23704fd109 (patch) | |
| tree | 8b98e6605155d5e77c72d626087db8a25f96dd8a /drivers/staging/rtl8192su/r8192U_pm.c | |
| parent | 13ff8a17e5ee76e8091ace29dfc96eb0b618fd79 (diff) | |
| parent | d061b26c40e9d5da42a02eaf55a9571a58406f00 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/epl/VirtualEthernetLinux.c
Diffstat (limited to 'drivers/staging/rtl8192su/r8192U_pm.c')
| -rw-r--r-- | drivers/staging/rtl8192su/r8192U_pm.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/staging/rtl8192su/r8192U_pm.c b/drivers/staging/rtl8192su/r8192U_pm.c index b1531a8d0cde..60d739b85eb7 100644 --- a/drivers/staging/rtl8192su/r8192U_pm.c +++ b/drivers/staging/rtl8192su/r8192U_pm.c @@ -9,7 +9,6 @@ Released under the terms of GPL (General Public Licence) */ -#ifdef CONFIG_RTL8192_PM #include "r8192U.h" #include "r8192U_pm.h" @@ -22,11 +21,8 @@ int rtl8192U_save_state (struct pci_dev *dev, u32 state) int rtl8192U_suspend(struct usb_interface *intf, pm_message_t state) { -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) struct net_device *dev = usb_get_intfdata(intf); -#else - //struct net_device *dev = (struct net_device *)ptr; -#endif + RT_TRACE(COMP_POWER, "============> r8192U suspend call.\n"); if(dev) { @@ -48,11 +44,7 @@ int rtl8192U_suspend(struct usb_interface *intf, pm_message_t state) int rtl8192U_resume (struct usb_interface *intf) { -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) struct net_device *dev = usb_get_intfdata(intf); -#else - //struct net_device *dev = (struct net_device *)ptr; -#endif RT_TRACE(COMP_POWER, "================>r8192U resume call."); @@ -78,4 +70,3 @@ int rtl8192U_enable_wake (struct pci_dev *dev, u32 state, int enable) return(-EAGAIN); } -#endif //CONFIG_RTL8192_PM |