Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 236066
b: refs/heads/master
c: 5ff6a1f
h: refs/heads/master
v: v3
  • Loading branch information
Uwe Kleine-König authored and Greg Kroah-Hartman committed Feb 18, 2011
1 parent fe90668 commit b7bc6f0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 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: d0e0086893de668db30f31b8ba407199a0f693d0
refs/heads/master: 5ff6a1fd5c3ad2cae9626016cefa1d474571d618
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.h
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ struct wlc_info {
u32 apsd_trigger_timeout; /* timeout value for apsd_trigger_timer (in ms)
* 0 == disable
*/
ac_bitmap_t apsd_trigger_ac; /* Permissible Acess Category in which APSD Null
ac_bitmap_t apsd_trigger_ac; /* Permissible Access Category in which APSD Null
* Trigger frames can be send
*/
u8 htphy_membership; /* HT PHY membership */
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/include/siutils.h
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ typedef struct si_info {

/*
* Macros to disable/restore function core(D11, ENET, ILINE20, etc) interrupts
* before after core switching to avoid invalid register accesss inside ISR.
* before after core switching to avoid invalid register access inside ISR.
*/
#define INTR_OFF(si, intr_val) \
if ((si)->intrsoff_fn && (si)->coreid[(si)->curidx] == (si)->dev_coreid) { \
Expand Down

0 comments on commit b7bc6f0

Please sign in to comment.