aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/video4linux/cx2341x/fw-decoder-api.txt
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 16:35:11 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 16:35:11 -0700
commit708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch)
treefe7c31bc0edef84eb1075c7e195340047d6aaa17 /Documentation/video4linux/cx2341x/fw-decoder-api.txt
parentf3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff)
parenta847825970e741e20a09c659978baa34016b63bc (diff)
downloadkernel_samsung_smdk4412-708e16892e1646594a29eaa7ac7b209b600b9fd2.zip
kernel_samsung_smdk4412-708e16892e1646594a29eaa7ac7b209b600b9fd2.tar.gz
kernel_samsung_smdk4412-708e16892e1646594a29eaa7ac7b209b600b9fd2.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits) Add missing maintainer countries in CREDITS Fix bytes <-> kilobytes typo in Kconfig for ramdisk fix a typo in Documentation/pi-futex.txt BUG_ON conversion for fs/xfs/ BUG_ON() conversion in fs/nfsd/ BUG_ON conversion for fs/reiserfs BUG_ON cleanups in arch/i386 BUG_ON cleanup in drivers/net/tokenring/ BUG_ON cleanup for drivers/md/ kerneldoc-typo in led-class.c debugfs: spelling fix rcutorture: Fix incorrect description of default for nreaders parameter parport: Remove space in function calls Michal Wronski: update contact info Spelling fix: "control" instead of "cotrol" reboot parameter in Documentation/kernel-parameters.txt Fix copy&waste bug in comment in scripts/kernel-doc remove duplicate "until" from kernel/workqueue.c ite_gpio fix tabbage fix file specification in comments ... Fixed trivial path conflicts due to removed files: arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'Documentation/video4linux/cx2341x/fw-decoder-api.txt')
-rw-r--r--Documentation/video4linux/cx2341x/fw-decoder-api.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/video4linux/cx2341x/fw-decoder-api.txt b/Documentation/video4linux/cx2341x/fw-decoder-api.txt
index 9df4fb3..78bf5f2 100644
--- a/Documentation/video4linux/cx2341x/fw-decoder-api.txt
+++ b/Documentation/video4linux/cx2341x/fw-decoder-api.txt
@@ -102,7 +102,7 @@ Param[0]
Name CX2341X_DEC_GET_XFER_INFO
Enum 9/0x09
Description
- This API call may be used to detect an end of stream condtion.
+ This API call may be used to detect an end of stream condition.
Result[0]
Stream type
Result[1]