diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:05:56 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:05:56 -0500 |
commit | 008d23e4852d78bb2618f2035f8b2110b6a6b968 (patch) | |
tree | 81c88f744f6f3fc84132527c1ddc0b4da410c5e2 /drivers/net/wireless/wl12xx/acx.h | |
parent | 8f685fbda43deccd130d192c9fcef1444649eaca (diff) | |
parent | bfc672dcf323877228682aff79dff8ecd9f30ff8 (diff) |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
Documentation/trace/events.txt: Remove obsolete sched_signal_send.
writeback: fix global_dirty_limits comment runtime -> real-time
ppc: fix comment typo singal -> signal
drivers: fix comment typo diable -> disable.
m68k: fix comment typo diable -> disable.
wireless: comment typo fix diable -> disable.
media: comment typo fix diable -> disable.
remove doc for obsolete dynamic-printk kernel-parameter
remove extraneous 'is' from Documentation/iostats.txt
Fix spelling milisec -> ms in snd_ps3 module parameter description
Fix spelling mistakes in comments
Revert conflicting V4L changes
i7core_edac: fix typos in comments
mm/rmap.c: fix comment
sound, ca0106: Fix assignment to 'channel'.
hrtimer: fix a typo in comment
init/Kconfig: fix typo
anon_inodes: fix wrong function name in comment
fix comment typos concerning "consistent"
poll: fix a typo in comment
...
Fix up trivial conflicts in:
- drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
- fs/ext4/ext4.h
Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
Diffstat (limited to 'drivers/net/wireless/wl12xx/acx.h')
-rw-r--r-- | drivers/net/wireless/wl12xx/acx.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/acx.h b/drivers/net/wireless/wl12xx/acx.h index 9cbc3f40c8dd..7bd8e4db4a71 100644 --- a/drivers/net/wireless/wl12xx/acx.h +++ b/drivers/net/wireless/wl12xx/acx.h | |||
@@ -47,9 +47,9 @@ | |||
47 | #define WL1271_ACX_INTR_HW_AVAILABLE BIT(5) | 47 | #define WL1271_ACX_INTR_HW_AVAILABLE BIT(5) |
48 | /* The MISC bit is used for aggregation of RX, TxComplete and TX rate update */ | 48 | /* The MISC bit is used for aggregation of RX, TxComplete and TX rate update */ |
49 | #define WL1271_ACX_INTR_DATA BIT(6) | 49 | #define WL1271_ACX_INTR_DATA BIT(6) |
50 | /* Trace meassge on MBOX #A */ | 50 | /* Trace message on MBOX #A */ |
51 | #define WL1271_ACX_INTR_TRACE_A BIT(7) | 51 | #define WL1271_ACX_INTR_TRACE_A BIT(7) |
52 | /* Trace meassge on MBOX #B */ | 52 | /* Trace message on MBOX #B */ |
53 | #define WL1271_ACX_INTR_TRACE_B BIT(8) | 53 | #define WL1271_ACX_INTR_TRACE_B BIT(8) |
54 | 54 | ||
55 | #define WL1271_ACX_INTR_ALL 0xFFFFFFFF | 55 | #define WL1271_ACX_INTR_ALL 0xFFFFFFFF |