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/Zoran | |
| 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/Zoran')
| -rw-r--r-- | Documentation/video4linux/Zoran | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/video4linux/Zoran b/Documentation/video4linux/Zoran index 0e89e767629..00e3f926781 100644 --- a/Documentation/video4linux/Zoran +++ b/Documentation/video4linux/Zoran | |||
| @@ -174,7 +174,7 @@ and is used in Argentinia, Uruguay, an a few others | |||
| 174 | We do not talk about how the audio is broadcast ! | 174 | We do not talk about how the audio is broadcast ! |
| 175 | 175 | ||
| 176 | A rather good sites about the TV standards are: | 176 | A rather good sites about the TV standards are: |
| 177 | http://www.sony.jp/ServiceArea/Voltage_map/ | 177 | http://www.sony.jp/support/ |
| 178 | http://info.electronicwerkstatt.de/bereiche/fernsehtechnik/frequenzen_und_normen/Fernsehnormen/ | 178 | http://info.electronicwerkstatt.de/bereiche/fernsehtechnik/frequenzen_und_normen/Fernsehnormen/ |
| 179 | and http://www.cabl.com/restaurant/channel.html | 179 | and http://www.cabl.com/restaurant/channel.html |
| 180 | 180 | ||
| @@ -330,7 +330,7 @@ These extensions are known as the v4l/mjpeg extensions. See zoran.h for | |||
| 330 | details (structs/ioctls). | 330 | details (structs/ioctls). |
| 331 | 331 | ||
| 332 | Information - video4linux: | 332 | Information - video4linux: |
| 333 | http://roadrunner.swansea.linux.org.uk/v4lapi.shtml | 333 | http://linux.bytesex.org/v4l2/API.html |
| 334 | Documentation/video4linux/API.html | 334 | Documentation/video4linux/API.html |
| 335 | /usr/include/linux/videodev.h | 335 | /usr/include/linux/videodev.h |
| 336 | 336 | ||
| @@ -390,7 +390,7 @@ BUZIOC_G_STATUS | |||
| 390 | Get the status of the input lines (video source connected/norm). | 390 | Get the status of the input lines (video source connected/norm). |
| 391 | 391 | ||
| 392 | For programming example, please, look at lavrec.c and lavplay.c code in | 392 | For programming example, please, look at lavrec.c and lavplay.c code in |
| 393 | lavtools-1.2p2 package (URL: http://www.cicese.mx/~mirsev/DC10plus/) | 393 | lavtools-1.2p2 package (URL: http://www.cicese.mx/) |
| 394 | and the 'examples' directory in the original Buz driver distribution. | 394 | and the 'examples' directory in the original Buz driver distribution. |
| 395 | 395 | ||
| 396 | Additional notes for software developers: | 396 | Additional notes for software developers: |