From 31cba48cfb6f7cec803005de1de99f8c92ba4bc1 Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Sat, 26 Mar 2011 02:17:52 +0100 Subject: [PATCH] --- yaml --- r: 248983 b: refs/heads/master c: b3b97f5c23c0a6944ec1f5481ceaac12528a826b h: refs/heads/master i: 248981: 7d2d24fa2f1861354c6887b2722f53338578f126 248979: 0029cd04dd035d0c514bcee0dcb276b368ebc8f2 248975: 7bf24efc11f882d7d2d5c74f088bed383c491ccd v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | 2 +- trunk/drivers/staging/brcm80211/include/bcmsrom_fmt.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0b1ecf172e9c..4fa7de6291c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0997325e31737e90626baac80ab687e51500b2ef +refs/heads/master: b3b97f5c23c0a6944ec1f5481ceaac12528a826b diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c index 0c89e854c4ce..d76546234169 100644 --- a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c @@ -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) { diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c index 3b2b554c0dbf..e362cad558b0 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c @@ -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 = diff --git a/trunk/drivers/staging/brcm80211/include/bcmsrom_fmt.h b/trunk/drivers/staging/brcm80211/include/bcmsrom_fmt.h index ae2bff828607..4666afd883a5 100644 --- a/trunk/drivers/staging/brcm80211/include/bcmsrom_fmt.h +++ b/trunk/drivers/staging/brcm80211/include/bcmsrom_fmt.h @@ -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. */