diff options
| author | Greg Kroah-Hartman | 2012-02-10 19:58:25 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-02-10 19:58:25 +0100 |
| commit | b91867f2ee5c84b550f95ce54c91b180f70f48cb (patch) | |
| tree | bd7a5be4484d539af13e6b345320455e989612cf /drivers/staging/rtl8712/drv_types.h | |
| parent | Merge tag 'staging-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | staging: sep: reworked crypto layer (diff) | |
| download | kernel-qcow2-linux-b91867f2ee5c84b550f95ce54c91b180f70f48cb.tar.gz kernel-qcow2-linux-b91867f2ee5c84b550f95ce54c91b180f70f48cb.tar.xz kernel-qcow2-linux-b91867f2ee5c84b550f95ce54c91b180f70f48cb.zip | |
Merge tag 'staging-3.3-rc3' into staging-next
This was done to resolve some merge issues with the following files that
had changed in both branches:
drivers/staging/rtl8712/rtl871x_sta_mgt.c
drivers/staging/tidspbridge/rmgr/drv_interface.c
drivers/staging/zcache/zcache-main.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8712/drv_types.h')
| -rw-r--r-- | drivers/staging/rtl8712/drv_types.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/rtl8712/drv_types.h b/drivers/staging/rtl8712/drv_types.h index ed85b4415207..e83665d06020 100644 --- a/drivers/staging/rtl8712/drv_types.h +++ b/drivers/staging/rtl8712/drv_types.h @@ -140,7 +140,6 @@ struct dvobj_priv { u8 ishighspeed; uint(*inirp_init)(struct _adapter *adapter); uint(*inirp_deinit)(struct _adapter *adapter); - struct semaphore usb_suspend_sema; struct usb_device *pusbdev; }; |