diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /Documentation/video4linux/API.html | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'Documentation/video4linux/API.html')
| -rw-r--r-- | Documentation/video4linux/API.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/video4linux/API.html b/Documentation/video4linux/API.html index 441407b12a9f..afbe9ae7ee96 100644 --- a/Documentation/video4linux/API.html +++ b/Documentation/video4linux/API.html | |||
| @@ -8,7 +8,7 @@ V4L original API</a> | |||
| 8 | </td><td> | 8 | </td><td> |
| 9 | Obsoleted by V4L2 API | 9 | Obsoleted by V4L2 API |
| 10 | </td></tr><tr><td> | 10 | </td></tr><tr><td> |
| 11 | <A HREF=http://www.linuxtv.org/downloads/video4linux/API/V4L2_API.html> | 11 | <A HREF=http://www.linuxtv.org/downloads/video4linux/API/V4L2_API> |
| 12 | V4L2 API</a> | 12 | V4L2 API</a> |
| 13 | </td><td> | 13 | </td><td> |
| 14 | Should be used for new projects | 14 | Should be used for new projects |