summaryrefslogtreecommitdiff
path: root/Documentation/admin-guide/media/pci-cardlist.rst
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-10-03 11:34:54 +0300
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-10-03 11:34:54 +0300
commit7c9df3ec493e353166527f56ad1540d052b92cd4 (patch)
treef21dc08043a900e6d92920065136a18fe6b138ec /Documentation/admin-guide/media/pci-cardlist.rst
parentba9fe6443db587e17b7fb66093a52194b79191dc (diff)
downloadlinux-7c9df3ec493e353166527f56ad1540d052b92cd4.tar.xz
media: add Zoran cardlist
Now that Zoran was re-added, we need to add its cardlist to the admin guide. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'Documentation/admin-guide/media/pci-cardlist.rst')
-rw-r--r--Documentation/admin-guide/media/pci-cardlist.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/admin-guide/media/pci-cardlist.rst b/Documentation/admin-guide/media/pci-cardlist.rst
index 434fe996b541..f4d670e632f8 100644
--- a/Documentation/admin-guide/media/pci-cardlist.rst
+++ b/Documentation/admin-guide/media/pci-cardlist.rst
@@ -90,6 +90,7 @@ sta2x11_vip STA2X11 VIP Video For Linux
tw5864 Techwell TW5864 video/audio grabber and encoder
tw686x Intersil/Techwell TW686x
tw68 Techwell tw68x Video For Linux
+zoran Zoran-36057/36067 JPEG codec
================ ========================================================
Some of those drivers support multiple devices, as shown at the card
@@ -105,3 +106,4 @@ lists below:
ivtv-cardlist
saa7134-cardlist
saa7164-cardlist
+ zoran-cardlist