diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-13 13:04:56 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-13 13:04:56 -0300 |
| commit | 29dbbb60b1b22bd956e7fc25a2b2d1a9ea577f79 (patch) | |
| tree | 3049a3bbf0ba48fd24b62aaff07ab2925dcb3743 /linux/drivers/media/video/cx88/cx88-input.c | |
| parent | f9533819a70608d97d03abd7766ffc3f1e3ea655 (diff) | |
| parent | 3d611f80a1b8888b9001e1738f24194c694a8bf4 (diff) | |
| download | mediapointer-dvb-s2-29dbbb60b1b22bd956e7fc25a2b2d1a9ea577f79.tar.gz mediapointer-dvb-s2-29dbbb60b1b22bd956e7fc25a2b2d1a9ea577f79.tar.bz2 | |
Merging mkrufky pvrusb2 tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-input.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-input.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-input.c b/linux/drivers/media/video/cx88/cx88-input.c index 94b9ab35f..11d2e625a 100644 --- a/linux/drivers/media/video/cx88/cx88-input.c +++ b/linux/drivers/media/video/cx88/cx88-input.c @@ -188,6 +188,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) ir->mask_keydown = 0x02; ir->polling = 5; /* ms */ break; + case CX88_BOARD_PROLINK_PLAYTVPVR: case CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO: ir_codes = ir_codes_pixelview; ir->gpio_addr = MO_GP1_IO; |