Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 248983
b: refs/heads/master
c: b3b97f5
h: refs/heads/master
i:
  248981: 7d2d24f
  248979: 0029cd0
  248975: 7bf24ef
v: v3
  • Loading branch information
Peter Huewe authored and Greg Kroah-Hartman committed Apr 5, 2011
1 parent 816b222 commit 31cba48
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 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: 0997325e31737e90626baac80ab687e51500b2ef
refs/heads/master: b3b97f5c23c0a6944ec1f5481ceaac12528a826b
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ extern SDIOH_API_RC sdioh_disable_func_intr(void)
}
#endif /* defined(OOB_INTR_ONLY) && defined(HW_OOB) */

/* Configure callback to client when we recieve client interrupt */
/* Configure callback to client when we receive client interrupt */
extern SDIOH_API_RC
sdioh_interrupt_register(sdioh_info_t *sd, sdioh_cb_fn_t fn, void *argh)
{
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ static int wlc_ffpld_check_txfunfl(struct wlc_info *wlc, int fid)
/*
compute a new dma xfer rate for max_mpdu @ max mcs.
This is the minimum dma rate that
can acheive no unferflow condition for the current mpdu size.
can achieve no underflow condition for the current mpdu size.
*/
/* note : we divide/multiply by 100 to avoid integer overflows */
fifo->dmaxferrate =
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/brcm80211/include/bcmsrom_fmt.h
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@

#define SROM_CRCREV 63

/* SROM Rev 4: Reallocate the software part of the srom to accomodate
/* SROM Rev 4: Reallocate the software part of the srom to accommodate
* MIMO features. It assumes up to two PCIE functions and 440 bytes
* of useable srom i.e. the useable storage in chips with OTP that
* of usable srom i.e. the usable storage in chips with OTP that
* implements hardware redundancy.
*/

Expand Down

0 comments on commit 31cba48

Please sign in to comment.