summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 10:30:07 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 10:30:07 -0700
commitab8e823515305a93715e71b81efcbe27c6ce0f59 (patch)
treeeb812c3886727e23feff7e275e3a7c7cbdd56f2f /Documentation
parent4d5e392c33820dc8861423bb1b8dae205ea0ad3d (diff)
parente1634208b77872ac0884da6d92f0d46f9a61eaa7 (diff)
downloadop-kernel-dev-ab8e823515305a93715e71b81efcbe27c6ce0f59.zip
op-kernel-dev-ab8e823515305a93715e71b81efcbe27c6ce0f59.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (4712): Fix warning when compiling on x86_i64 V4L/DVB (4711): Radio: No need to return void V4L/DVB (4708): Add tveeprom support for Philips FM1236/FM1216ME MK5 V4L/DVB (4707): 4linux: complete conversion to hotplug safe PCI API V4L/DVB (4706): Do not enable VIDEO_V4L2 unconditionally V4L/DVB (4704): SAA713x: fixed compile warning in SECAM fixup V4L/DVB (4703): Add support for the ASUS EUROPA2 OEM board V4L/DVB (4702): Fix: set antenna input for DVB-T for Asus P7131 Dual hybrid V4L/DVB (4701): Saa713x audio fixes V4L/DVB (4676a): Remove Kconfig item for DiB7000M support
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/video4linux/CARDLIST.saa71341
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 6fb82ac..53ce6a3 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -98,3 +98,4 @@
97 -> LifeView FlyDVB-S /Acorp TV134DS [5168:0300,4e42:0300]
98 -> Proteus Pro 2309 [0919:2003]
99 -> AVerMedia TV Hybrid A16AR [1461:2c00]
+100 -> Asus Europa2 OEM [1043:4860]
OpenPOWER on IntegriCloud