diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:31:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:31:02 -0400 |
| commit | 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 (patch) | |
| tree | 5adc1ff2eaf64d450bf28bb6b2ce890db2567288 /Documentation/video4linux/README.ivtv | |
| parent | 5cf65713f87775c548e3eb48dbafa32e12f28000 (diff) | |
| parent | 0ea6e61122196509af82cc4f36cbdaacbefb8227 (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: (48 commits)
Documentation: update broken web addresses.
fix comment typo "choosed" -> "chosen"
hostap:hostap_hw.c Fix typo in comment
Fix spelling contorller -> controller in comments
Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault
fs/Kconfig: Fix typo Userpace -> Userspace
Removing dead MACH_U300_BS26
drivers/infiniband: Remove unnecessary casts of private_data
fs/ocfs2: Remove unnecessary casts of private_data
libfc: use ARRAY_SIZE
scsi: bfa: use ARRAY_SIZE
drm: i915: use ARRAY_SIZE
drm: drm_edid: use ARRAY_SIZE
synclink: use ARRAY_SIZE
block: cciss: use ARRAY_SIZE
comment typo fixes: charater => character
fix comment typos concerning "challenge"
arm: plat-spear: fix typo in kerneldoc
reiserfs: typo comment fix
update email address
...
Diffstat (limited to 'Documentation/video4linux/README.ivtv')
| -rw-r--r-- | Documentation/video4linux/README.ivtv | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/video4linux/README.ivtv b/Documentation/video4linux/README.ivtv index 73df22c40bfe..42b06686eb78 100644 --- a/Documentation/video4linux/README.ivtv +++ b/Documentation/video4linux/README.ivtv | |||
| @@ -10,7 +10,7 @@ Hauppauge PVR-350. | |||
| 10 | NOTE: this driver requires the latest encoder firmware (version 2.06.039, size | 10 | NOTE: this driver requires the latest encoder firmware (version 2.06.039, size |
| 11 | 376836 bytes). Get the firmware from here: | 11 | 376836 bytes). Get the firmware from here: |
| 12 | 12 | ||
| 13 | http://dl.ivtvdriver.org/ivtv/firmware/firmware.tar.gz | 13 | http://dl.ivtvdriver.org/ivtv/firmware/ |
| 14 | 14 | ||
| 15 | NOTE: 'normal' TV applications do not work with this driver, you need | 15 | NOTE: 'normal' TV applications do not work with this driver, you need |
| 16 | an application that can handle MPEG input such as mplayer, xine, MythTV, | 16 | an application that can handle MPEG input such as mplayer, xine, MythTV, |