diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-10 10:58:25 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-10 10:58:25 -0800 |
| commit | b91867f2ee5c84b550f95ce54c91b180f70f48cb (patch) | |
| tree | bd7a5be4484d539af13e6b345320455e989612cf /drivers/staging/rtl8712/os_intfs.c | |
| parent | Merge tag 'staging-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging (diff) | |
| parent | staging: sep: reworked crypto layer (diff) | |
| download | linux-dev-b91867f2ee5c84b550f95ce54c91b180f70f48cb.tar.xz linux-dev-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/os_intfs.c')
| -rw-r--r-- | drivers/staging/rtl8712/os_intfs.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c index 98a3d684f9b2..b22fea53a746 100644 --- a/drivers/staging/rtl8712/os_intfs.c +++ b/drivers/staging/rtl8712/os_intfs.c @@ -330,7 +330,6 @@ u8 r8712_init_drv_sw(struct _adapter *padapter) padapter->stapriv.padapter = padapter; r8712_init_bcmc_stainfo(padapter); r8712_init_pwrctrl_priv(padapter); - sema_init(&(padapter->pwrctrlpriv.pnp_pwr_mgnt_sema), 0); mp871xinit(padapter); if (init_default_value(padapter) != _SUCCESS) return _FAIL; |