aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/video4linux/ibmcam.txt
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-08-18 15:17:30 +0200
committerTakashi Iwai <tiwai@suse.de>2010-08-18 15:17:30 +0200
commit6ab561c8aab2e4af535f09adbc6253f958536848 (patch)
tree37846adb4ea106485720d113e252d71d615c23ed /Documentation/video4linux/ibmcam.txt
parent4f4e8f69895c8696a4bcc751817d4b186023ac44 (diff)
parentcbaa9f60d5d5c3af10f94e0d49789d5b82341a4a (diff)
downloadkernel_samsung_smdk4412-6ab561c8aab2e4af535f09adbc6253f958536848.zip
kernel_samsung_smdk4412-6ab561c8aab2e4af535f09adbc6253f958536848.tar.gz
kernel_samsung_smdk4412-6ab561c8aab2e4af535f09adbc6253f958536848.tar.bz2
Merge branch 'topic/isa' into topic/misc
Diffstat (limited to 'Documentation/video4linux/ibmcam.txt')
-rw-r--r--Documentation/video4linux/ibmcam.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/video4linux/ibmcam.txt b/Documentation/video4linux/ibmcam.txt
index 397a94e..a510552 100644
--- a/Documentation/video4linux/ibmcam.txt
+++ b/Documentation/video4linux/ibmcam.txt
@@ -27,9 +27,8 @@ SUPPORTED CAMERAS:
Xirlink "C-It" camera, also known as "IBM PC Camera".
The device uses proprietary ASIC (and compression method);
-it is manufactured by Xirlink. See http://www.xirlink.com/
-(renamed to http://www.veo.com), http://www.ibmpccamera.com,
-or http://www.c-itnow.com/ for details and pictures.
+it is manufactured by Xirlink. See http://xirlinkwebcam.sourceforge.net,
+http://www.ibmpccamera.com, or http://www.c-itnow.com/ for details and pictures.
This very chipset ("X Chip", as marked at the factory)
is used in several other cameras, and they are supported