diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/rtl8192su/r8192U_pm.h | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
| download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192su/r8192U_pm.h')
| -rw-r--r-- | drivers/staging/rtl8192su/r8192U_pm.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/staging/rtl8192su/r8192U_pm.h b/drivers/staging/rtl8192su/r8192U_pm.h deleted file mode 100644 index d89e423..0000000 --- a/drivers/staging/rtl8192su/r8192U_pm.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - Power management interface routines. - Written by Mariusz Matuszek. - This code is currently just a placeholder for later work and - does not do anything useful. - - This is part of rtl8180 OpenSource driver. - Copyright (C) Andrea Merello 2004 <andreamrl@tiscali.it> - Released under the terms of GPL (General Public Licence) - -*/ - - -#ifndef R8192_PM_H -#define R8192_PM_H - -#include <linux/types.h> -#include <linux/usb.h> - -int rtl8192U_save_tate (struct pci_dev *dev, u32 state); -int rtl8192U_suspend(struct usb_interface *intf, pm_message_t state); -int rtl8192U_resume (struct usb_interface *intf); -int rtl8192U_enable_wake (struct pci_dev *dev, u32 state, int enable); - -#endif //R8192U_PM_H |
