Gitweb:     http://git.kernel.org/linus/9e1d9e7bac5c2bafc3c0c51db88c15f3fbcec83f
Commit:     9e1d9e7bac5c2bafc3c0c51db88c15f3fbcec83f
Parent:     e65f8c4e3eef3a0946f8e8fba1fb6aabde734f50
Author:     Herton Ronaldo Krzesinski <herton@mandriva.com.br>
AuthorDate: Sat May 8 02:23:37 2010 -0300
Committer:  Mauro Carvalho Chehab <mchehab@redhat.com>
CommitDate: Tue Jun 1 01:21:52 2010 -0300

    V4L/DVB: saa7134: add support for Avermedia M733A
    
    This change adds support for Avermedia M733A. The original version for
    linux 2.6.31 was sent to me from Avermedia, original author is unknown.
    I ported it to current kernels, expanded and fixed key code handling for
    RM-K6 remote control, and added an additional pci id also supported.
    
    [mchehab@redhat.com: make checkpatch.pl happier]
    Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
 Documentation/video4linux/CARDLIST.saa7134         |    5 +-
 drivers/media/IR/keymaps/Makefile                  |    1 +
 .../media/IR/keymaps/rc-avermedia-m733a-rm-k6.c    |   95 ++++++++++++++++++++
 drivers/media/video/saa7134/saa7134-cards.c        |   55 +++++++++++
 drivers/media/video/saa7134/saa7134-input.c        |    7 ++
 drivers/media/video/saa7134/saa7134.h              |    1 +
 include/media/rc-map.h                             |    1 +
 7 files changed, 163 insertions(+), 2 deletions(-)

diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 070f257..1387a69 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -176,5 +176,6 @@
 175 -> Leadtek Winfast DTV1000S                 [107d:6655]
 176 -> Beholder BeholdTV 505 RDS                [0000:5051]
 177 -> Hawell HW-404M7
-179 -> Beholder BeholdTV H7			[5ace:7190]
-180 -> Beholder BeholdTV A7			[5ace:7090]
+178 -> Beholder BeholdTV H7                     [5ace:7190]
+179 -> ...
[ message continues ]