Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 228289
b: refs/heads/master
c: e304151
h: refs/heads/master
i:
  228287: e5591c0
v: v3
  • Loading branch information
Roland Vossen authored and Greg Kroah-Hartman committed Dec 7, 2010
1 parent ebe0614 commit 7cbf1a6
Show file tree
Hide file tree
Showing 9 changed files with 253 additions and 241 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8538576474e162e4967532a80305d17e871f2fa5
refs/heads/master: e304151f150104412c9a304dffd6dc5c160ea336
6 changes: 3 additions & 3 deletions trunk/drivers/staging/brcm80211/sys/wlc_alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,10 @@ struct wlc_info *wlc_attach_malloc(struct osl_info *osh, uint unit, uint *err,
}
wlc->pub->wlc = wlc;

/* allocate wlc_hw_info_t state structure */
/* allocate struct wlc_hw_info state structure */

wlc->hw = (wlc_hw_info_t *)wlc_calloc(osh, unit,
sizeof(wlc_hw_info_t));
wlc->hw = (struct wlc_hw_info *)wlc_calloc(osh, unit,
sizeof(struct wlc_hw_info));
if (wlc->hw == NULL) {
*err = 1005;
goto fail;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/sys/wlc_antsel.c
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ const u8 mimo_2x3_div_antselid_tbl[16] = {

antsel_info_t *wlc_antsel_attach(struct wlc_info *wlc, struct osl_info *osh,
wlc_pub_t *pub,
wlc_hw_info_t *wlc_hw) {
struct wlc_hw_info *wlc_hw) {
antsel_info_t *asi;

asi = kzalloc(sizeof(antsel_info_t), GFP_ATOMIC);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/sys/wlc_antsel.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
extern antsel_info_t *wlc_antsel_attach(struct wlc_info *wlc,
struct osl_info *osh,
wlc_pub_t *pub,
wlc_hw_info_t *wlc_hw);
struct wlc_hw_info *wlc_hw);
extern void wlc_antsel_detach(antsel_info_t *asi);
extern void wlc_antsel_init(antsel_info_t *asi);
extern void wlc_antsel_antcfg_get(antsel_info_t *asi, bool usedef, bool sel,
Expand Down
Loading

0 comments on commit 7cbf1a6

Please sign in to comment.