summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaud Patard <apatard@mandriva.com>2005-11-09 06:36:55 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 16:56:13 +0100
commit6af90ab5e7a9111a861fde33726ae960d30915f0 (patch)
tree3ed149a82cc5b5a1c5f5e85218b2960b2677d7f8
parent[PATCH] v4l: 695: added more pci id (diff)
downloadlinux-6af90ab5e7a9111a861fde33726ae960d30915f0.tar.xz
linux-6af90ab5e7a9111a861fde33726ae960d30915f0.zip
[PATCH] v4l: 700: added ir for lifeview flytv platinum mini2
- Added IR for LifeView FlyTV Platinum Mini2. Signed-off-by: Arnaud Patard <apatard@mandriva.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c1
-rw-r--r--drivers/media/video/saa7134/saa7134-input.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index a096799dc5f9..3bb0644145bb 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2823,6 +2823,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
dev->has_remote = 1;
board_flyvideo(dev);
break;
+ case SAA7134_BOARD_FLYTVPLATINUM_MINI2:
case SAA7134_BOARD_FLYTVPLATINUM_FM:
case SAA7134_BOARD_CINERGY400:
case SAA7134_BOARD_CINERGY600:
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index b69b18c5f189..f6fe5f889a4a 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -516,6 +516,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
case SAA7134_BOARD_FLYVIDEO2000:
case SAA7134_BOARD_FLYVIDEO3000:
case SAA7134_BOARD_FLYTVPLATINUM_FM:
+ case SAA7134_BOARD_FLYTVPLATINUM_MINI2:
ir_codes = flyvideo_codes;
mask_keycode = 0xEC00000;
mask_keydown = 0x0040000;