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/rtl8712/usb_osintf.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/rtl8712/usb_osintf.h')
| -rw-r--r-- | drivers/staging/rtl8712/usb_osintf.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/drivers/staging/rtl8712/usb_osintf.h b/drivers/staging/rtl8712/usb_osintf.h new file mode 100644 index 0000000..0da6c1d --- /dev/null +++ b/drivers/staging/rtl8712/usb_osintf.h @@ -0,0 +1,24 @@ +#ifndef __USB_OSINTF_H +#define __USB_OSINTF_H + +#include "osdep_service.h" +#include "drv_types.h" +#include "usb_vendor_req.h" + +#define USBD_HALTED(Status) ((u32)(Status) >> 30 == 3) + +extern char *r8712_initmac; + +unsigned int r8712_usb_inirp_init(struct _adapter *padapter); +unsigned int r8712_usb_inirp_deinit(struct _adapter *padapter); +uint rtl871x_hal_init(struct _adapter *padapter); +uint rtl8712_hal_deinit(struct _adapter *padapter); + +void rtl871x_intf_stop(struct _adapter *padapter); +void r871x_dev_unload(struct _adapter *padapter); +void r8712_stop_drv_threads(struct _adapter *padapter); +u8 r8712_init_drv_sw(struct _adapter *padapter); +u8 r8712_free_drv_sw(struct _adapter *padapter); +struct net_device *r8712_init_netdev(void); + +#endif |
