diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 19:47:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 19:47:22 -0500 |
| commit | 9073e1a804c3096eda84ee7cbf11d1f174236c75 (patch) | |
| tree | 2f1b488b606bc03f8c5ce133f9158196fef07cd2 /arch/mips/include/asm | |
| parent | 4937e2a6f939a41bf811378e80d71f68aa0950c6 (diff) | |
| parent | 2bb9936beac2eed0c1ed907f83694bc752e159d9 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"Usual earth-shaking, news-breaking, rocket science pile from
trivial.git"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits)
doc: usb: Fix typo in Documentation/usb/gadget_configs.txt
doc: add missing files to timers/00-INDEX
timekeeping: Fix some trivial typos in comments
mm: Fix some trivial typos in comments
irq: Fix some trivial typos in comments
NUMA: fix typos in Kconfig help text
mm: update 00-INDEX
doc: Documentation/DMA-attributes.txt fix typo
DRM: comment: `halve' -> `half'
Docs: Kconfig: `devlopers' -> `developers'
doc: typo on word accounting in kprobes.c in mutliple architectures
treewide: fix "usefull" typo
treewide: fix "distingush" typo
mm/Kconfig: Grammar s/an/a/
kexec: Typo s/the/then/
Documentation/kvm: Update cpuid documentation for steal time and pv eoi
treewide: Fix common typo in "identify"
__page_to_pfn: Fix typo in comment
Correct some typos for word frequency
clk: fixed-factor: Fix a trivial typo
...
Diffstat (limited to 'arch/mips/include/asm')
| -rw-r--r-- | arch/mips/include/asm/octeon/cvmx-pip.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/include/asm/octeon/cvmx-pip.h b/arch/mips/include/asm/octeon/cvmx-pip.h index a76fe5a57a9f..df69bfd2b006 100644 --- a/arch/mips/include/asm/octeon/cvmx-pip.h +++ b/arch/mips/include/asm/octeon/cvmx-pip.h | |||
| @@ -192,13 +192,13 @@ typedef struct { | |||
| 192 | /* Number of packets processed by PIP */ | 192 | /* Number of packets processed by PIP */ |
| 193 | uint32_t packets; | 193 | uint32_t packets; |
| 194 | /* | 194 | /* |
| 195 | * Number of indentified L2 multicast packets. Does not | 195 | * Number of identified L2 multicast packets. Does not |
| 196 | * include broadcast packets. Only includes packets whose | 196 | * include broadcast packets. Only includes packets whose |
| 197 | * parse mode is SKIP_TO_L2 | 197 | * parse mode is SKIP_TO_L2 |
| 198 | */ | 198 | */ |
| 199 | uint32_t multicast_packets; | 199 | uint32_t multicast_packets; |
| 200 | /* | 200 | /* |
| 201 | * Number of indentified L2 broadcast packets. Does not | 201 | * Number of identified L2 broadcast packets. Does not |
| 202 | * include multicast packets. Only includes packets whose | 202 | * include multicast packets. Only includes packets whose |
| 203 | * parse mode is SKIP_TO_L2 | 203 | * parse mode is SKIP_TO_L2 |
| 204 | */ | 204 | */ |