aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/video4linux/bttv/Specs
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/bttv/Specs
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/bttv/Specs')
-rw-r--r--Documentation/video4linux/bttv/Specs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/video4linux/bttv/Specs b/Documentation/video4linux/bttv/Specs
index 79b9e57..f32466c 100644
--- a/Documentation/video4linux/bttv/Specs
+++ b/Documentation/video4linux/bttv/Specs
@@ -1,3 +1,3 @@
Philips http://www.Semiconductors.COM/pip/
-Conexant http://www.conexant.com/techinfo/default.asp
-Micronas http://www.micronas.de/pages/product_documentation/index.html
+Conexant http://www.conexant.com/
+Micronas http://www.micronas.com/en/home/index.html